diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 17f6d1c..9ac4510 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -6,7 +6,7 @@
   {
     state: () => ({
       wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/${useUserStore().id}`,
-      websocket: '', // ws连接
+      websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
       wsPingTime: 60000, // 心跳定时时长
@@ -59,6 +59,7 @@
           }
           // 监听socket消息接收s
           socket.onmessage = (msg) => {
+            console.log(msg, 'websocket初始')
             // 转换为json对象
             const data = JSON.parse(msg.data)
             console.log(data, 'websocket 返回消息')
@@ -93,7 +94,9 @@
       // 断开websocket
       destroyWebSocket() {
         this.wsIsReconnect = false
-        this.websocket.close()
+        if (this.websocket) {
+          this.websocket.close()
+        }
         if (this.wsPingTimer) {
           console.log('停止定时器')
           clearInterval(this.wsPingTimer)

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 17f6d1c..9ac4510 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -6,7 +6,7 @@
   {
     state: () => ({
       wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/${useUserStore().id}`,
-      websocket: '', // ws连接
+      websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
       wsPingTime: 60000, // 心跳定时时长
@@ -59,6 +59,7 @@
           }
           // 监听socket消息接收s
           socket.onmessage = (msg) => {
+            console.log(msg, 'websocket初始')
             // 转换为json对象
             const data = JSON.parse(msg.data)
             console.log(data, 'websocket 返回消息')
@@ -93,7 +94,9 @@
       // 断开websocket
       destroyWebSocket() {
         this.wsIsReconnect = false
-        this.websocket.close()
+        if (this.websocket) {
+          this.websocket.close()
+        }
         if (this.wsPingTimer) {
           console.log('停止定时器')
           clearInterval(this.wsPingTimer)
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 733efc3..c750426 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -761,7 +761,7 @@
         </el-table-column>
       </el-table>
       <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" @add="confirmPerson" />
+      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
   </app-container>
 </template>

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 17f6d1c..9ac4510 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -6,7 +6,7 @@
   {
     state: () => ({
       wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/${useUserStore().id}`,
-      websocket: '', // ws连接
+      websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
       wsPingTime: 60000, // 心跳定时时长
@@ -59,6 +59,7 @@
           }
           // 监听socket消息接收s
           socket.onmessage = (msg) => {
+            console.log(msg, 'websocket初始')
             // 转换为json对象
             const data = JSON.parse(msg.data)
             console.log(data, 'websocket 返回消息')
@@ -93,7 +94,9 @@
       // 断开websocket
       destroyWebSocket() {
         this.wsIsReconnect = false
-        this.websocket.close()
+        if (this.websocket) {
+          this.websocket.close()
+        }
         if (this.wsPingTimer) {
           console.log('停止定时器')
           clearInterval(this.wsPingTimer)
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 733efc3..c750426 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -761,7 +761,7 @@
         </el-table-column>
       </el-table>
       <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" @add="confirmPerson" />
+      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 91058ac..303f239 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -8,6 +8,12 @@
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  needAdmin: { // 是否展示admin用户
+    type: Boolean,
+    default: true,
+  },
+})
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -43,8 +49,14 @@
   select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
+      if (props.needAdmin) {
+        list.value = res.data.rows
+        total.value = res.data.total
+      }
+      else {
+        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        total.value = res.data.total - 1
+      }
     }
   })
 }

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 17f6d1c..9ac4510 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -6,7 +6,7 @@
   {
     state: () => ({
       wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/${useUserStore().id}`,
-      websocket: '', // ws连接
+      websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
       wsPingTime: 60000, // 心跳定时时长
@@ -59,6 +59,7 @@
           }
           // 监听socket消息接收s
           socket.onmessage = (msg) => {
+            console.log(msg, 'websocket初始')
             // 转换为json对象
             const data = JSON.parse(msg.data)
             console.log(data, 'websocket 返回消息')
@@ -93,7 +94,9 @@
       // 断开websocket
       destroyWebSocket() {
         this.wsIsReconnect = false
-        this.websocket.close()
+        if (this.websocket) {
+          this.websocket.close()
+        }
         if (this.wsPingTimer) {
           console.log('停止定时器')
           clearInterval(this.wsPingTimer)
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 733efc3..c750426 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -761,7 +761,7 @@
         </el-table-column>
       </el-table>
       <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" @add="confirmPerson" />
+      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 91058ac..303f239 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -8,6 +8,12 @@
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  needAdmin: { // 是否展示admin用户
+    type: Boolean,
+    default: true,
+  },
+})
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -43,8 +49,14 @@
   select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
+      if (props.needAdmin) {
+        list.value = res.data.rows
+        total.value = res.data.total
+      }
+      else {
+        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        total.value = res.data.total - 1
+      }
     }
   })
 }
diff --git a/src/views/system/tool/fileConfiguration/addDDialog.vue b/src/views/system/tool/fileConfiguration/addDDialog.vue
index 69b5832..469f2ae 100644
--- a/src/views/system/tool/fileConfiguration/addDDialog.vue
+++ b/src/views/system/tool/fileConfiguration/addDDialog.vue
@@ -5,10 +5,8 @@
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
-import userListComp from '@/views/measure/person/components/userListDialog.vue'
-import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
-import { addeFileListPage } from '@/api/system/tool'
+import { addeFileListPage, updateFileListPage } from '@/api/system/tool'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const updateTime = ref('')
@@ -85,18 +83,25 @@
             type: 'success',
             message: '添加成功',
           })
+          close()
         })
       }
       else {
-        console.log('编辑')
+        updateFileListPage(ruleForm.value).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '修改成功',
+          })
+          close()
+        })
       }
     }
   })
 }
 // 获取文件类型
-const fileTypeList = ref([])
+const fileTypeList = ref<any>([])
 const getFileType = () => {
-  getDictByCode('').then((res) => {
+  getDictByCode('configFileType').then((res) => {
     fileTypeList.value = res.data
   })
 }
@@ -126,7 +131,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
-        ruleForm.minioFileName = res.data[0]
+        ruleForm.value.minioFileName = res.data[0]
         ElMessage.success('上传成功')
       }
       else {
@@ -141,15 +146,15 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body class="container" @close="resetForm">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="60%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="文件编号" prop="minioFileName">
+        <el-col :span="8">
+          <el-form-item label="文件编号">
             <el-input v-model="ruleForm.downloadNo" disabled placeholder="系统自动生成" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="模块名称" prop="moduleName">
             <el-input v-model="ruleForm.moduleName" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请输入模块名称'" />
           </el-form-item>
@@ -159,10 +164,11 @@
             <el-input v-model="ruleForm.updateUser" disabled />
           </el-form-item>
         </el-col> -->
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="创建时间" prop="updateTime">
             <el-date-picker
               v-model="updateTime"
+              :disabled="title === '详情'"
               type="datetime"
               format="YYYY-MM-DD hh:mm"
               value-format="YYYY-MM-DD hh:mm"
@@ -171,19 +177,19 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="业务类型" prop="businessDownloadType">
             <el-select v-model="ruleForm.businessDownloadType" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请选择业务类型'">
               <el-option v-for="item in businessTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="文件名称" prop="fileName">
             <el-input v-model="ruleForm.fileName" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请输入文件名称'" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="文件类型" prop="fileType">
             <el-select v-model="ruleForm.fileType" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请选择文件类型'">
               <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -199,10 +205,10 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="模板附件" prop="minioFileName">
             <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
               {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
             </el-button>
             <input v-show="title === '123'" ref="fileRef" type="file" @change="onFileChange">
@@ -220,8 +226,6 @@
         </el-button>
       </div>
     </template>
-    <!-- 多选用户弹窗 -->
-    <user-list-comp ref="userListRef" @add="confirmUser" />
   </el-dialog>
 </template>
 

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 13377a4..130ee5d 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -30,6 +30,10 @@
   { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
   { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
   { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
 ]
 
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
@@ -66,6 +70,10 @@
   // 连接 websocket
   websocket.initWebSocket()
 })
+onBeforeMount(() => {
+  // 断开 websocket
+  // websocket.destroyWebSocket()
+})
 </script>
 
 <template>
@@ -110,7 +118,7 @@
           </template>
           <template #default>
             <div class="message-container">
-              <div class="message-title">消息({{ messageList.length }})</div>
+              <div v-show="messageList.length" class="message-title">消息({{ messageList.length }})</div>
               <el-scrollbar max-height="400px">
                 <div v-for="message of messageList" :key="message.id" class="message-item">
                   <div class="icon">
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 17f6d1c..9ac4510 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -6,7 +6,7 @@
   {
     state: () => ({
       wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/${useUserStore().id}`,
-      websocket: '', // ws连接
+      websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
       wsPingTime: 60000, // 心跳定时时长
@@ -59,6 +59,7 @@
           }
           // 监听socket消息接收s
           socket.onmessage = (msg) => {
+            console.log(msg, 'websocket初始')
             // 转换为json对象
             const data = JSON.parse(msg.data)
             console.log(data, 'websocket 返回消息')
@@ -93,7 +94,9 @@
       // 断开websocket
       destroyWebSocket() {
         this.wsIsReconnect = false
-        this.websocket.close()
+        if (this.websocket) {
+          this.websocket.close()
+        }
         if (this.wsPingTimer) {
           console.log('停止定时器')
           clearInterval(this.wsPingTimer)
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 733efc3..c750426 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -761,7 +761,7 @@
         </el-table-column>
       </el-table>
       <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" @add="confirmPerson" />
+      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 91058ac..303f239 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -8,6 +8,12 @@
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
+const props = defineProps({
+  needAdmin: { // 是否展示admin用户
+    type: Boolean,
+    default: true,
+  },
+})
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -43,8 +49,14 @@
   select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
+      if (props.needAdmin) {
+        list.value = res.data.rows
+        total.value = res.data.total
+      }
+      else {
+        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        total.value = res.data.total - 1
+      }
     }
   })
 }
diff --git a/src/views/system/tool/fileConfiguration/addDDialog.vue b/src/views/system/tool/fileConfiguration/addDDialog.vue
index 69b5832..469f2ae 100644
--- a/src/views/system/tool/fileConfiguration/addDDialog.vue
+++ b/src/views/system/tool/fileConfiguration/addDDialog.vue
@@ -5,10 +5,8 @@
 import dayjs from 'dayjs'
 import showPhoto from '../showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
-import userListComp from '@/views/measure/person/components/userListDialog.vue'
-import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
-import { addeFileListPage } from '@/api/system/tool'
+import { addeFileListPage, updateFileListPage } from '@/api/system/tool'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const updateTime = ref('')
@@ -85,18 +83,25 @@
             type: 'success',
             message: '添加成功',
           })
+          close()
         })
       }
       else {
-        console.log('编辑')
+        updateFileListPage(ruleForm.value).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '修改成功',
+          })
+          close()
+        })
       }
     }
   })
 }
 // 获取文件类型
-const fileTypeList = ref([])
+const fileTypeList = ref<any>([])
 const getFileType = () => {
-  getDictByCode('').then((res) => {
+  getDictByCode('configFileType').then((res) => {
     fileTypeList.value = res.data
   })
 }
@@ -126,7 +131,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleFormRef.value?.clearValidate('minioFileName')
-        ruleForm.minioFileName = res.data[0]
+        ruleForm.value.minioFileName = res.data[0]
         ElMessage.success('上传成功')
       }
       else {
@@ -141,15 +146,15 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body class="container" @close="resetForm">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="60%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
       <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="文件编号" prop="minioFileName">
+        <el-col :span="8">
+          <el-form-item label="文件编号">
             <el-input v-model="ruleForm.downloadNo" disabled placeholder="系统自动生成" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="模块名称" prop="moduleName">
             <el-input v-model="ruleForm.moduleName" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请输入模块名称'" />
           </el-form-item>
@@ -159,10 +164,11 @@
             <el-input v-model="ruleForm.updateUser" disabled />
           </el-form-item>
         </el-col> -->
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="创建时间" prop="updateTime">
             <el-date-picker
               v-model="updateTime"
+              :disabled="title === '详情'"
               type="datetime"
               format="YYYY-MM-DD hh:mm"
               value-format="YYYY-MM-DD hh:mm"
@@ -171,19 +177,19 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="业务类型" prop="businessDownloadType">
             <el-select v-model="ruleForm.businessDownloadType" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请选择业务类型'">
               <el-option v-for="item in businessTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="文件名称" prop="fileName">
             <el-input v-model="ruleForm.fileName" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请输入文件名称'" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="文件类型" prop="fileType">
             <el-select v-model="ruleForm.fileType" :disabled="title === '详情'" :placeholder="title === '详情' ? '' : '请选择文件类型'">
               <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -199,10 +205,10 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="模板附件" prop="minioFileName">
             <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
               {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
             </el-button>
             <input v-show="title === '123'" ref="fileRef" type="file" @change="onFileChange">
@@ -220,8 +226,6 @@
         </el-button>
       </div>
     </template>
-    <!-- 多选用户弹窗 -->
-    <user-list-comp ref="userListRef" @add="confirmUser" />
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/fileConfiguration/configuration.vue b/src/views/system/tool/fileConfiguration/configuration.vue
index 21b4230..d699e65 100644
--- a/src/views/system/tool/fileConfiguration/configuration.vue
+++ b/src/views/system/tool/fileConfiguration/configuration.vue
@@ -1,12 +1,9 @@
 <!-- 文件配置管理 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { queryType, signType, typeofSign } from '../tool_interface'
 import addDDialog from './addDDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { deleteFileListPage, exportFileListPage, getFileListPage } 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<any>({
@@ -22,9 +19,9 @@
 const columns = ref([
   { text: '文件编号', value: 'downloadNo', align: 'center' },
   { text: '模块名称', value: 'moduleName', align: 'center' },
-  { text: '业务类型', value: 'businessDownloadType', align: 'center' },
+  { text: '业务类型', value: 'businessDownloadTypeName', align: 'center' },
   { text: '文件名称', value: 'fileName', align: 'center' },
-  { text: '文件类型', value: 'fileType', align: 'center' },
+  { text: '文件类型', value: 'fileTypeName', align: 'center' },
   // { text: '创建人', value: 'updateUser', align: 'center' },
   { text: '创建时间', value: 'updateTime', align: 'center' },
 ])
@@ -57,7 +54,7 @@
   getList()
 }
 // 编辑
-const edit = (row: signType) => {
+const edit = (row: any) => {
   addRef.value.initDialog({
     ...row,
     title: '编辑',
@@ -65,16 +62,16 @@
 }
 
 // 详情
-const detail = (row: signType) => {
+const detail = (row: any) => {
   addRef.value.initDialog({
     ...row,
     title: '详情',
   })
 }
 // 删除
-const remove = (row: signType) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
-    `确认删除${row.signName}吗？`,
+    `确认删除${row.fileName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -114,9 +111,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref<signType[]>([])
+const selectList = ref<any[]>([])
 // 表格多选
-const multiSelect = (row: signType[]) => {
+const multiSelect = (row: any[]) => {
   selectList.value = row
 }
 // 导出
@@ -126,21 +123,24 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  console.log(selectList.value)
   if (selectList.value.length) {
     selectList.value.forEach((item) => {
       searchQuery.ids?.push(item.id as string)
     })
+    exportFileListPage(searchQuery).then((res) => {
+      exportFile(res.data, '配置文件管理')
+      loading.close()
+      searchQuery.ids = []
+    })
+      .catch((_) => {
+        loading.close()
+      })
   }
   else {
-    searchQuery.ids = []
-  }
-  exportFileListPage(searchQuery).then((res) => {
     loading.close()
-    searchQuery.ids = []
-  })
-    .catch((_) => {
-      loading.close()
-    })
+    ElMessage('请先选择需要导出的内容')
+  }
 }
 // 打印
 function printList() {
@@ -153,11 +153,11 @@
     }
   })
   if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '签名管理')
+    printJSON(list.value, properties, '配置文件管理')
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: signType) => selectIds.includes(item.id))
-    printJSON(printList, properties, '签名管理')
+    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+    printJSON(printList, properties, '配置文件管理')
   }
   else {
     ElMessage('无可打印内容')