diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index c072834..7cf226d 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -13,6 +13,7 @@
 import addElectricQuantity from './addElectricQuantity.vue'
 import addOxygenSmoke from './addOxygenSmoke.vue'
 import {
+  batchImport,
   deleteConfig,
   exportConfigList,
   getConfigList,
@@ -86,23 +87,23 @@
     ]),
     list: listMap.smokeList,
   },
-  {
-    id: 'ups',
-    name: 'UPS电源',
-    columns: ref<TableColumn[]>([
-      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
-      { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '报警阈值', value: 'bjyz', align: 'center' },
-      { text: '重传次数', value: 'cccs', align: 'center' },
-      { text: '采集开始时间', value: 'cjkssj', align: 'center' },
-      { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
-      { text: '采集次数', value: 'cjcs', align: 'center' },
-      { text: 'IP地址', value: 'ip', align: 'center' },
-      { text: '端口', value: 'port', align: 'center' },
-      { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
-    ]),
-    list: listMap.upsList,
-  },
+  // {
+  //   id: 'ups',
+  //   name: 'UPS电源',
+  //   columns: ref<TableColumn[]>([
+  //     { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+  //     { text: '设备名称', value: 'deviceName', align: 'center' },
+  //     { text: '报警阈值', value: 'bjyz', align: 'center' },
+  //     { text: '重传次数', value: 'cccs', align: 'center' },
+  //     { text: '采集开始时间', value: 'cjkssj', align: 'center' },
+  //     { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
+  //     { text: '采集次数', value: 'cjcs', align: 'center' },
+  //     { text: 'IP地址', value: 'ip', align: 'center' },
+  //     { text: '端口', value: 'port', align: 'center' },
+  //     { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
+  //   ]),
+  //   list: listMap.upsList,
+  // },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -228,15 +229,15 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     // 调批量导入接口
-    // batchImport(fd).then((res) => {
-    //   ElMessage.success('上传成功')
-    //   fileRef.value.value = ''
-    //   loading.close()
-    //   fetchData(true)
-    //   loading.close()
-    // }).catch(() => {
-    //   loading.close()
-    // })
+    batchImport(fd, currentMenu.value).then((res) => {
+      ElMessage.success('上传成功')
+      fileRef.value.value = ''
+      loading.close()
+      fetchData(true)
+      loading.close()
+    }).catch(() => {
+      loading.close()
+    })
   }
 }
 // 批量导入
@@ -288,6 +289,24 @@
   }
 }
 
+// 模板下载
+const templateDownload = () => {
+  switch (currentMenu.value) {
+    case 'temperatureHumidity':
+      useTemplateDownload('温湿度网络传感器')
+      break
+    case 'electricQuantity':
+      useTemplateDownload('智能电量仪')
+      break
+    case 'oxygen':
+      useTemplateDownload('氧气传感器')
+      break
+    case 'smoke':
+      useTemplateDownload('烟雾报警器')
+      break
+  }
+}
+
 // ---------------------------------------钩子----------------------------------------------
 onMounted(async () => {
   fetchData(false)
@@ -309,7 +328,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="openDialog('add', null)" />
         <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="useTemplateDownload('设备信息管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index c072834..7cf226d 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -13,6 +13,7 @@
 import addElectricQuantity from './addElectricQuantity.vue'
 import addOxygenSmoke from './addOxygenSmoke.vue'
 import {
+  batchImport,
   deleteConfig,
   exportConfigList,
   getConfigList,
@@ -86,23 +87,23 @@
     ]),
     list: listMap.smokeList,
   },
-  {
-    id: 'ups',
-    name: 'UPS电源',
-    columns: ref<TableColumn[]>([
-      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
-      { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '报警阈值', value: 'bjyz', align: 'center' },
-      { text: '重传次数', value: 'cccs', align: 'center' },
-      { text: '采集开始时间', value: 'cjkssj', align: 'center' },
-      { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
-      { text: '采集次数', value: 'cjcs', align: 'center' },
-      { text: 'IP地址', value: 'ip', align: 'center' },
-      { text: '端口', value: 'port', align: 'center' },
-      { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
-    ]),
-    list: listMap.upsList,
-  },
+  // {
+  //   id: 'ups',
+  //   name: 'UPS电源',
+  //   columns: ref<TableColumn[]>([
+  //     { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+  //     { text: '设备名称', value: 'deviceName', align: 'center' },
+  //     { text: '报警阈值', value: 'bjyz', align: 'center' },
+  //     { text: '重传次数', value: 'cccs', align: 'center' },
+  //     { text: '采集开始时间', value: 'cjkssj', align: 'center' },
+  //     { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
+  //     { text: '采集次数', value: 'cjcs', align: 'center' },
+  //     { text: 'IP地址', value: 'ip', align: 'center' },
+  //     { text: '端口', value: 'port', align: 'center' },
+  //     { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
+  //   ]),
+  //   list: listMap.upsList,
+  // },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -228,15 +229,15 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     // 调批量导入接口
-    // batchImport(fd).then((res) => {
-    //   ElMessage.success('上传成功')
-    //   fileRef.value.value = ''
-    //   loading.close()
-    //   fetchData(true)
-    //   loading.close()
-    // }).catch(() => {
-    //   loading.close()
-    // })
+    batchImport(fd, currentMenu.value).then((res) => {
+      ElMessage.success('上传成功')
+      fileRef.value.value = ''
+      loading.close()
+      fetchData(true)
+      loading.close()
+    }).catch(() => {
+      loading.close()
+    })
   }
 }
 // 批量导入
@@ -288,6 +289,24 @@
   }
 }
 
+// 模板下载
+const templateDownload = () => {
+  switch (currentMenu.value) {
+    case 'temperatureHumidity':
+      useTemplateDownload('温湿度网络传感器')
+      break
+    case 'electricQuantity':
+      useTemplateDownload('智能电量仪')
+      break
+    case 'oxygen':
+      useTemplateDownload('氧气传感器')
+      break
+    case 'smoke':
+      useTemplateDownload('烟雾报警器')
+      break
+  }
+}
+
 // ---------------------------------------钩子----------------------------------------------
 onMounted(async () => {
   fetchData(false)
@@ -309,7 +328,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="openDialog('add', null)" />
         <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="useTemplateDownload('设备信息管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index e9b32e7..f82b15f 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -20,16 +20,28 @@
   locationName: '', // 地点名称
   locationNo: '', // 地点编号
   locationPosition: '', // 地点位置
+  locationLab: '', // 地点实验室
 }) // 表单
 const rules = ref<FormRules>({
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+const locationLabList = [
+  {
+    id: '西昌实验室',
+    name: '西昌实验室',
+  },
+  {
+    id: '海口实验室',
+    name: '海口实验室',
+  },
+]
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -40,6 +52,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     locationPosition: '', // 地点位置
+    locationLab: '', // 地点实验室
   }
 }
 
@@ -53,12 +66,14 @@
     form.value.locationName = row.locationName // 地点名称
     form.value.locationNo = row.locationNo // 地点编号
     form.value.locationPosition = row.locationPosition // 地点位置
+    form.value.locationLab = row.locationLab // 地点实验室
     infoId.value = row.id // 主键
   }
   else if (pageTypeParam === 'add') {
     form.value.locationName = '' // 地点名称
     form.value.locationNo = '' // 地点编号
     form.value.locationPosition = '' // 地点位置
+    form.value.locationLab = '' // 地点实验室
     infoId.value = '' // 主键
   }
 }
@@ -125,6 +140,18 @@
       <el-form-item label="地点位置:" prop="locationPosition">
         <el-input v-model="form.locationPosition" type="textarea" autosize :disabled="pageType === 'detail'" placeholder="请输入地点位置" />
       </el-form-item>
+      <el-form-item label="地点实验室:" prop="locationLab">
+        <el-select
+          v-model="form.locationLab"
+          placeholder="请选择地点实验室"
+          filterable
+          clearable
+          :disabled="pageType === 'detail'"
+          style="width: 100%;"
+        >
+          <el-option v-for="item in locationLabList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer footer">

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index c072834..7cf226d 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -13,6 +13,7 @@
 import addElectricQuantity from './addElectricQuantity.vue'
 import addOxygenSmoke from './addOxygenSmoke.vue'
 import {
+  batchImport,
   deleteConfig,
   exportConfigList,
   getConfigList,
@@ -86,23 +87,23 @@
     ]),
     list: listMap.smokeList,
   },
-  {
-    id: 'ups',
-    name: 'UPS电源',
-    columns: ref<TableColumn[]>([
-      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
-      { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '报警阈值', value: 'bjyz', align: 'center' },
-      { text: '重传次数', value: 'cccs', align: 'center' },
-      { text: '采集开始时间', value: 'cjkssj', align: 'center' },
-      { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
-      { text: '采集次数', value: 'cjcs', align: 'center' },
-      { text: 'IP地址', value: 'ip', align: 'center' },
-      { text: '端口', value: 'port', align: 'center' },
-      { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
-    ]),
-    list: listMap.upsList,
-  },
+  // {
+  //   id: 'ups',
+  //   name: 'UPS电源',
+  //   columns: ref<TableColumn[]>([
+  //     { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+  //     { text: '设备名称', value: 'deviceName', align: 'center' },
+  //     { text: '报警阈值', value: 'bjyz', align: 'center' },
+  //     { text: '重传次数', value: 'cccs', align: 'center' },
+  //     { text: '采集开始时间', value: 'cjkssj', align: 'center' },
+  //     { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
+  //     { text: '采集次数', value: 'cjcs', align: 'center' },
+  //     { text: 'IP地址', value: 'ip', align: 'center' },
+  //     { text: '端口', value: 'port', align: 'center' },
+  //     { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
+  //   ]),
+  //   list: listMap.upsList,
+  // },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -228,15 +229,15 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     // 调批量导入接口
-    // batchImport(fd).then((res) => {
-    //   ElMessage.success('上传成功')
-    //   fileRef.value.value = ''
-    //   loading.close()
-    //   fetchData(true)
-    //   loading.close()
-    // }).catch(() => {
-    //   loading.close()
-    // })
+    batchImport(fd, currentMenu.value).then((res) => {
+      ElMessage.success('上传成功')
+      fileRef.value.value = ''
+      loading.close()
+      fetchData(true)
+      loading.close()
+    }).catch(() => {
+      loading.close()
+    })
   }
 }
 // 批量导入
@@ -288,6 +289,24 @@
   }
 }
 
+// 模板下载
+const templateDownload = () => {
+  switch (currentMenu.value) {
+    case 'temperatureHumidity':
+      useTemplateDownload('温湿度网络传感器')
+      break
+    case 'electricQuantity':
+      useTemplateDownload('智能电量仪')
+      break
+    case 'oxygen':
+      useTemplateDownload('氧气传感器')
+      break
+    case 'smoke':
+      useTemplateDownload('烟雾报警器')
+      break
+  }
+}
+
 // ---------------------------------------钩子----------------------------------------------
 onMounted(async () => {
   fetchData(false)
@@ -309,7 +328,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="openDialog('add', null)" />
         <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="useTemplateDownload('设备信息管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index e9b32e7..f82b15f 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -20,16 +20,28 @@
   locationName: '', // 地点名称
   locationNo: '', // 地点编号
   locationPosition: '', // 地点位置
+  locationLab: '', // 地点实验室
 }) // 表单
 const rules = ref<FormRules>({
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+const locationLabList = [
+  {
+    id: '西昌实验室',
+    name: '西昌实验室',
+  },
+  {
+    id: '海口实验室',
+    name: '海口实验室',
+  },
+]
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -40,6 +52,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     locationPosition: '', // 地点位置
+    locationLab: '', // 地点实验室
   }
 }
 
@@ -53,12 +66,14 @@
     form.value.locationName = row.locationName // 地点名称
     form.value.locationNo = row.locationNo // 地点编号
     form.value.locationPosition = row.locationPosition // 地点位置
+    form.value.locationLab = row.locationLab // 地点实验室
     infoId.value = row.id // 主键
   }
   else if (pageTypeParam === 'add') {
     form.value.locationName = '' // 地点名称
     form.value.locationNo = '' // 地点编号
     form.value.locationPosition = '' // 地点位置
+    form.value.locationLab = '' // 地点实验室
     infoId.value = '' // 主键
   }
 }
@@ -125,6 +140,18 @@
       <el-form-item label="地点位置:" prop="locationPosition">
         <el-input v-model="form.locationPosition" type="textarea" autosize :disabled="pageType === 'detail'" placeholder="请输入地点位置" />
       </el-form-item>
+      <el-form-item label="地点实验室:" prop="locationLab">
+        <el-select
+          v-model="form.locationLab"
+          placeholder="请选择地点实验室"
+          filterable
+          clearable
+          :disabled="pageType === 'detail'"
+          style="width: 100%;"
+        >
+          <el-option v-for="item in locationLabList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer footer">
diff --git a/src/views/laboratory/place/list.vue b/src/views/laboratory/place/list.vue
index bf291e4..193ddf2 100644
--- a/src/views/laboratory/place/list.vue
+++ b/src/views/laboratory/place/list.vue
@@ -21,6 +21,7 @@
   { text: '地点名称', value: 'locationName', align: 'center', width: '160' },
   { text: '地点编号', value: 'locationNo', align: 'center' },
   { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '地点实验室', value: 'locationLab', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index c072834..7cf226d 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -13,6 +13,7 @@
 import addElectricQuantity from './addElectricQuantity.vue'
 import addOxygenSmoke from './addOxygenSmoke.vue'
 import {
+  batchImport,
   deleteConfig,
   exportConfigList,
   getConfigList,
@@ -86,23 +87,23 @@
     ]),
     list: listMap.smokeList,
   },
-  {
-    id: 'ups',
-    name: 'UPS电源',
-    columns: ref<TableColumn[]>([
-      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
-      { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '报警阈值', value: 'bjyz', align: 'center' },
-      { text: '重传次数', value: 'cccs', align: 'center' },
-      { text: '采集开始时间', value: 'cjkssj', align: 'center' },
-      { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
-      { text: '采集次数', value: 'cjcs', align: 'center' },
-      { text: 'IP地址', value: 'ip', align: 'center' },
-      { text: '端口', value: 'port', align: 'center' },
-      { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
-    ]),
-    list: listMap.upsList,
-  },
+  // {
+  //   id: 'ups',
+  //   name: 'UPS电源',
+  //   columns: ref<TableColumn[]>([
+  //     { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+  //     { text: '设备名称', value: 'deviceName', align: 'center' },
+  //     { text: '报警阈值', value: 'bjyz', align: 'center' },
+  //     { text: '重传次数', value: 'cccs', align: 'center' },
+  //     { text: '采集开始时间', value: 'cjkssj', align: 'center' },
+  //     { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
+  //     { text: '采集次数', value: 'cjcs', align: 'center' },
+  //     { text: 'IP地址', value: 'ip', align: 'center' },
+  //     { text: '端口', value: 'port', align: 'center' },
+  //     { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
+  //   ]),
+  //   list: listMap.upsList,
+  // },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -228,15 +229,15 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     // 调批量导入接口
-    // batchImport(fd).then((res) => {
-    //   ElMessage.success('上传成功')
-    //   fileRef.value.value = ''
-    //   loading.close()
-    //   fetchData(true)
-    //   loading.close()
-    // }).catch(() => {
-    //   loading.close()
-    // })
+    batchImport(fd, currentMenu.value).then((res) => {
+      ElMessage.success('上传成功')
+      fileRef.value.value = ''
+      loading.close()
+      fetchData(true)
+      loading.close()
+    }).catch(() => {
+      loading.close()
+    })
   }
 }
 // 批量导入
@@ -288,6 +289,24 @@
   }
 }
 
+// 模板下载
+const templateDownload = () => {
+  switch (currentMenu.value) {
+    case 'temperatureHumidity':
+      useTemplateDownload('温湿度网络传感器')
+      break
+    case 'electricQuantity':
+      useTemplateDownload('智能电量仪')
+      break
+    case 'oxygen':
+      useTemplateDownload('氧气传感器')
+      break
+    case 'smoke':
+      useTemplateDownload('烟雾报警器')
+      break
+  }
+}
+
 // ---------------------------------------钩子----------------------------------------------
 onMounted(async () => {
   fetchData(false)
@@ -309,7 +328,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="openDialog('add', null)" />
         <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="useTemplateDownload('设备信息管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index e9b32e7..f82b15f 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -20,16 +20,28 @@
   locationName: '', // 地点名称
   locationNo: '', // 地点编号
   locationPosition: '', // 地点位置
+  locationLab: '', // 地点实验室
 }) // 表单
 const rules = ref<FormRules>({
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+const locationLabList = [
+  {
+    id: '西昌实验室',
+    name: '西昌实验室',
+  },
+  {
+    id: '海口实验室',
+    name: '海口实验室',
+  },
+]
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -40,6 +52,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     locationPosition: '', // 地点位置
+    locationLab: '', // 地点实验室
   }
 }
 
@@ -53,12 +66,14 @@
     form.value.locationName = row.locationName // 地点名称
     form.value.locationNo = row.locationNo // 地点编号
     form.value.locationPosition = row.locationPosition // 地点位置
+    form.value.locationLab = row.locationLab // 地点实验室
     infoId.value = row.id // 主键
   }
   else if (pageTypeParam === 'add') {
     form.value.locationName = '' // 地点名称
     form.value.locationNo = '' // 地点编号
     form.value.locationPosition = '' // 地点位置
+    form.value.locationLab = '' // 地点实验室
     infoId.value = '' // 主键
   }
 }
@@ -125,6 +140,18 @@
       <el-form-item label="地点位置:" prop="locationPosition">
         <el-input v-model="form.locationPosition" type="textarea" autosize :disabled="pageType === 'detail'" placeholder="请输入地点位置" />
       </el-form-item>
+      <el-form-item label="地点实验室:" prop="locationLab">
+        <el-select
+          v-model="form.locationLab"
+          placeholder="请选择地点实验室"
+          filterable
+          clearable
+          :disabled="pageType === 'detail'"
+          style="width: 100%;"
+        >
+          <el-option v-for="item in locationLabList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer footer">
diff --git a/src/views/laboratory/place/list.vue b/src/views/laboratory/place/list.vue
index bf291e4..193ddf2 100644
--- a/src/views/laboratory/place/list.vue
+++ b/src/views/laboratory/place/list.vue
@@ -21,6 +21,7 @@
   { text: '地点名称', value: 'locationName', align: 'center', width: '160' },
   { text: '地点编号', value: 'locationNo', align: 'center' },
   { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '地点实验室', value: 'locationLab', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
diff --git a/src/views/laboratory/place/place-interface.ts b/src/views/laboratory/place/place-interface.ts
index 4f735a8..2cfef34 100644
--- a/src/views/laboratory/place/place-interface.ts
+++ b/src/views/laboratory/place/place-interface.ts
@@ -13,6 +13,7 @@
   createUser: string // 创建人
   createUserId: string// 创建人id
   createTime: string // 创建时间
+  locationLab: string // 地点实验室
 }
 
 export interface IForm {
@@ -22,4 +23,5 @@
   locationName: string// 地点名称
   locationNo: string// 地点编号
   locationPosition: string// 地点位置
+  locationLab: string // 地点实验室
 }

diff --git a/src/api/laboratory/equipment/config.ts b/src/api/laboratory/equipment/config.ts
index 1a3d8c2..6d05d50 100644
--- a/src/api/laboratory/equipment/config.ts
+++ b/src/api/laboratory/equipment/config.ts
@@ -52,9 +52,9 @@
 }
 
 // 批量导入
-export function batchImport(data: object) {
+export function batchImport(data: object, type: string) {
   return request({
-    url: `${prefix}/import`,
+    url: `${prefix}/${type}/import`,
     method: 'post',
     data,
   })
diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f7536a4..f42266e 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -5,6 +5,9 @@
 import type { IForm, IList } from './list-interface'
 import { addEventList, updateEventList } from '@/api/laboratory/alarm/event'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { deptType, dictType } from '@/global'
+
 const emits = defineEmits(['refresh'])
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -25,6 +28,7 @@
   thirdLevelAlarm: 0, //	三级报警(%)
 }) // 表单
 const rules = ref<FormRules>({
+  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
   eventNo: [{ required: true, message: '事件编号不能为空', trigger: 'blur' }],
   eventName: [{ required: true, message: '事件名称不能为空', trigger: 'blur' }],
   firstLevelAlarm: [{ required: true, message: '一级报警不能为空', trigger: 'blur' }],
@@ -35,6 +39,18 @@
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+
+// -------------------------------------------字典------------------------------------------
+const typeList = ref<dictType[]>([]) // 设备类型
+
+// 获取字典值
+async function getDict() {
+// 设备类型
+  getDictByCode('deviceType').then((response) => {
+    typeList.value = response.data
+  })
+}
+getDict()
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -58,7 +74,7 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
   if (pageTypeParam === 'edit') { // 编辑时初始化数据
-    // form.value.deviceType = row.deviceType //	设备类型(字典code)
+    form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
     form.value.eventNo = row.eventNo //	事件编号
@@ -126,6 +142,23 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="`事件管理-${textMap[pageType]}`" append-to-body width="600px" class="container" @close="resetForm">
     <el-form ref="ruleFormRef" v-loading="loading" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="设备类型:" prop="deviceType">
+        <el-select
+          v-model.trim="form.deviceType"
+          clearable
+          :placeholder="pageType === 'detail' ? '' : '请选择设备类型'"
+          size="default"
+          :disabled="pageType === 'detail'"
+          class="full-width-input"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="事件编号:" prop="eventNo">
         <el-input v-model="form.eventNo" :disabled="pageType === 'detail'" placeholder="请输入地点编号" />
       </el-form-item>
diff --git a/src/views/laboratory/alarm/event/list-interface.ts b/src/views/laboratory/alarm/event/list-interface.ts
index 048dbfc..a0b8662 100644
--- a/src/views/laboratory/alarm/event/list-interface.ts
+++ b/src/views/laboratory/alarm/event/list-interface.ts
@@ -16,6 +16,7 @@
   secondLevelAlarm: number	//	二级报警(%)
   thirdLevelAlarm: number	//	三级报警(%)
   createTime: string // 创建时间
+  deviceType: string // 设备类型
 }
 
 export interface IForm {
diff --git a/src/views/laboratory/alarm/event/list.vue b/src/views/laboratory/alarm/event/list.vue
index c5c77e5..c65a59f 100644
--- a/src/views/laboratory/alarm/event/list.vue
+++ b/src/views/laboratory/alarm/event/list.vue
@@ -21,6 +21,7 @@
 const columns = ref<TableColumn[]>([
   { text: '事件编号', value: 'eventNo', align: 'center', width: '160' },
   { text: '事件名称', value: 'eventName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '120' },
   { text: '一级报警(%)', value: 'firstLevelAlarm', align: 'center' },
   { text: '二级报警(%)', value: 'secondLevelAlarm', align: 'center' },
   { text: '三级报警(%)', value: 'thirdLevelAlarm', align: 'center' },
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index c072834..7cf226d 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -13,6 +13,7 @@
 import addElectricQuantity from './addElectricQuantity.vue'
 import addOxygenSmoke from './addOxygenSmoke.vue'
 import {
+  batchImport,
   deleteConfig,
   exportConfigList,
   getConfigList,
@@ -86,23 +87,23 @@
     ]),
     list: listMap.smokeList,
   },
-  {
-    id: 'ups',
-    name: 'UPS电源',
-    columns: ref<TableColumn[]>([
-      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
-      { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '报警阈值', value: 'bjyz', align: 'center' },
-      { text: '重传次数', value: 'cccs', align: 'center' },
-      { text: '采集开始时间', value: 'cjkssj', align: 'center' },
-      { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
-      { text: '采集次数', value: 'cjcs', align: 'center' },
-      { text: 'IP地址', value: 'ip', align: 'center' },
-      { text: '端口', value: 'port', align: 'center' },
-      { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
-    ]),
-    list: listMap.upsList,
-  },
+  // {
+  //   id: 'ups',
+  //   name: 'UPS电源',
+  //   columns: ref<TableColumn[]>([
+  //     { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+  //     { text: '设备名称', value: 'deviceName', align: 'center' },
+  //     { text: '报警阈值', value: 'bjyz', align: 'center' },
+  //     { text: '重传次数', value: 'cccs', align: 'center' },
+  //     { text: '采集开始时间', value: 'cjkssj', align: 'center' },
+  //     { text: '采集间隔（分）', value: 'cjjg', align: 'center' },
+  //     { text: '采集次数', value: 'cjcs', align: 'center' },
+  //     { text: 'IP地址', value: 'ip', align: 'center' },
+  //     { text: '端口', value: 'port', align: 'center' },
+  //     { text: '最大尝试次数', value: 'zdcscs', align: 'center' },
+  //   ]),
+  //   list: listMap.upsList,
+  // },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -228,15 +229,15 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     // 调批量导入接口
-    // batchImport(fd).then((res) => {
-    //   ElMessage.success('上传成功')
-    //   fileRef.value.value = ''
-    //   loading.close()
-    //   fetchData(true)
-    //   loading.close()
-    // }).catch(() => {
-    //   loading.close()
-    // })
+    batchImport(fd, currentMenu.value).then((res) => {
+      ElMessage.success('上传成功')
+      fileRef.value.value = ''
+      loading.close()
+      fetchData(true)
+      loading.close()
+    }).catch(() => {
+      loading.close()
+    })
   }
 }
 // 批量导入
@@ -288,6 +289,24 @@
   }
 }
 
+// 模板下载
+const templateDownload = () => {
+  switch (currentMenu.value) {
+    case 'temperatureHumidity':
+      useTemplateDownload('温湿度网络传感器')
+      break
+    case 'electricQuantity':
+      useTemplateDownload('智能电量仪')
+      break
+    case 'oxygen':
+      useTemplateDownload('氧气传感器')
+      break
+    case 'smoke':
+      useTemplateDownload('烟雾报警器')
+      break
+  }
+}
+
 // ---------------------------------------钩子----------------------------------------------
 onMounted(async () => {
   fetchData(false)
@@ -309,7 +328,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="openDialog('add', null)" />
         <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="useTemplateDownload('设备信息管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
       </template>
       <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index e9b32e7..f82b15f 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -20,16 +20,28 @@
   locationName: '', // 地点名称
   locationNo: '', // 地点编号
   locationPosition: '', // 地点位置
+  locationLab: '', // 地点实验室
 }) // 表单
 const rules = ref<FormRules>({
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
 const infoId = ref('') // id，主键
 const loading = ref(false)
+const locationLabList = [
+  {
+    id: '西昌实验室',
+    name: '西昌实验室',
+  },
+  {
+    id: '海口实验室',
+    name: '海口实验室',
+  },
+]
 // ----------------------------------------方法-------------------------------------------------
 // 清空表单
 const clear = () => {
@@ -40,6 +52,7 @@
     locationName: '', // 地点名称
     locationNo: '', // 地点编号
     locationPosition: '', // 地点位置
+    locationLab: '', // 地点实验室
   }
 }
 
@@ -53,12 +66,14 @@
     form.value.locationName = row.locationName // 地点名称
     form.value.locationNo = row.locationNo // 地点编号
     form.value.locationPosition = row.locationPosition // 地点位置
+    form.value.locationLab = row.locationLab // 地点实验室
     infoId.value = row.id // 主键
   }
   else if (pageTypeParam === 'add') {
     form.value.locationName = '' // 地点名称
     form.value.locationNo = '' // 地点编号
     form.value.locationPosition = '' // 地点位置
+    form.value.locationLab = '' // 地点实验室
     infoId.value = '' // 主键
   }
 }
@@ -125,6 +140,18 @@
       <el-form-item label="地点位置:" prop="locationPosition">
         <el-input v-model="form.locationPosition" type="textarea" autosize :disabled="pageType === 'detail'" placeholder="请输入地点位置" />
       </el-form-item>
+      <el-form-item label="地点实验室:" prop="locationLab">
+        <el-select
+          v-model="form.locationLab"
+          placeholder="请选择地点实验室"
+          filterable
+          clearable
+          :disabled="pageType === 'detail'"
+          style="width: 100%;"
+        >
+          <el-option v-for="item in locationLabList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer footer">
diff --git a/src/views/laboratory/place/list.vue b/src/views/laboratory/place/list.vue
index bf291e4..193ddf2 100644
--- a/src/views/laboratory/place/list.vue
+++ b/src/views/laboratory/place/list.vue
@@ -21,6 +21,7 @@
   { text: '地点名称', value: 'locationName', align: 'center', width: '160' },
   { text: '地点编号', value: 'locationNo', align: 'center' },
   { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '地点实验室', value: 'locationLab', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
diff --git a/src/views/laboratory/place/place-interface.ts b/src/views/laboratory/place/place-interface.ts
index 4f735a8..2cfef34 100644
--- a/src/views/laboratory/place/place-interface.ts
+++ b/src/views/laboratory/place/place-interface.ts
@@ -13,6 +13,7 @@
   createUser: string // 创建人
   createUserId: string// 创建人id
   createTime: string // 创建时间
+  locationLab: string // 地点实验室
 }
 
 export interface IForm {
@@ -22,4 +23,5 @@
   locationName: string// 地点名称
   locationNo: string// 地点编号
   locationPosition: string// 地点位置
+  locationLab: string // 地点实验室
 }
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index cdaee28..c05fe7b 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,7 +110,7 @@
       if (!checkFile(type)) {
         return
       }
-      if (ruleForm.value.minioFileName.length > 30) {
+      if (ruleForm.value.minioFileName.length > 50) {
         ElMessage.warning('文件名长度超出最大限制')
         return
       }