diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }
diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue
index 3f95d30..b4bcbcd 100644
--- a/src/views/laboratory/overview/components/message.vue
+++ b/src/views/laboratory/overview/components/message.vue
@@ -2,6 +2,8 @@
 <script setup lang="ts" name="MessageScrolling">
 import { ref } from 'vue'
 import { getOverviewAlarmDetail } from '@/api/laboratory/overView'
+const $router = useRouter()
+
 const form = ref({
   confirmedCount: 0, // 已确认报警数量
   unconfirmedCount: 0, // 未确认报警数量
@@ -18,6 +20,14 @@
     form.value.currentAlarmCount = res.data.confirmedCount + res.data.unconfirmedCount // 当前报警数 =已确认 + 未确认
   })
 }
+
+// 点击报警标识
+const goCurrentAlarm = () => {
+  $router.push({
+    path: '/labAlarm/currentList',
+  })
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -34,26 +44,35 @@
       </el-icon>
       <span style="color: #444c59;margin-left: 20px;">报警总数<span style="margin-left: 16px;color: red;font-weight: 600;">{{ form.alarmTotal }}</span></span>
       <!-- 未确认  -->
-      <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
-        {{ form.unconfirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="未确认" placement="top-start">
+        <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
+          {{ form.unconfirmedCount }}
+        </el-button>
+      </el-tooltip>
+
       <!-- 已确认  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
-        {{ form.confirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已确认" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
+          {{ form.confirmedCount }}
+        </el-button>
+      </el-tooltip>
       <!-- 已消警  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
-        {{ form.canceledCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已消警" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
+          {{ form.canceledCount }}
+        </el-button>
+      </el-tooltip>
     </div>
     <!-- 当前报警  -->
-    <div style="padding-right: 60px;">
-      <el-badge :value="form.currentAlarmCount" class="item">
-        <el-icon style="margin-right: 10px;">
-          <svg-icon name="icon-overView-message" />
-        </el-icon>
-      </el-badge>
-    </div>
+    <el-tooltip class="item" effect="dark" content="当前告警" placement="left-start">
+      <div style="padding-right: 40px;cursor: pointer;z-index: 9;" @click="goCurrentAlarm">
+        <el-badge :value="form.currentAlarmCount" class="item">
+          <el-icon style="margin-right: 10px;">
+            <svg-icon name="icon-overView-message" />
+          </el-icon>
+        </el-badge>
+      </div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -71,6 +90,7 @@
   opacity: 1;
   align-items: center;
   transition: opacity 0.2s;
+  z-index: 10;
 }
 
 .carousel-item {

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }
diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue
index 3f95d30..b4bcbcd 100644
--- a/src/views/laboratory/overview/components/message.vue
+++ b/src/views/laboratory/overview/components/message.vue
@@ -2,6 +2,8 @@
 <script setup lang="ts" name="MessageScrolling">
 import { ref } from 'vue'
 import { getOverviewAlarmDetail } from '@/api/laboratory/overView'
+const $router = useRouter()
+
 const form = ref({
   confirmedCount: 0, // 已确认报警数量
   unconfirmedCount: 0, // 未确认报警数量
@@ -18,6 +20,14 @@
     form.value.currentAlarmCount = res.data.confirmedCount + res.data.unconfirmedCount // 当前报警数 =已确认 + 未确认
   })
 }
+
+// 点击报警标识
+const goCurrentAlarm = () => {
+  $router.push({
+    path: '/labAlarm/currentList',
+  })
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -34,26 +44,35 @@
       </el-icon>
       <span style="color: #444c59;margin-left: 20px;">报警总数<span style="margin-left: 16px;color: red;font-weight: 600;">{{ form.alarmTotal }}</span></span>
       <!-- 未确认  -->
-      <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
-        {{ form.unconfirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="未确认" placement="top-start">
+        <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
+          {{ form.unconfirmedCount }}
+        </el-button>
+      </el-tooltip>
+
       <!-- 已确认  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
-        {{ form.confirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已确认" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
+          {{ form.confirmedCount }}
+        </el-button>
+      </el-tooltip>
       <!-- 已消警  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
-        {{ form.canceledCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已消警" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
+          {{ form.canceledCount }}
+        </el-button>
+      </el-tooltip>
     </div>
     <!-- 当前报警  -->
-    <div style="padding-right: 60px;">
-      <el-badge :value="form.currentAlarmCount" class="item">
-        <el-icon style="margin-right: 10px;">
-          <svg-icon name="icon-overView-message" />
-        </el-icon>
-      </el-badge>
-    </div>
+    <el-tooltip class="item" effect="dark" content="当前告警" placement="left-start">
+      <div style="padding-right: 40px;cursor: pointer;z-index: 9;" @click="goCurrentAlarm">
+        <el-badge :value="form.currentAlarmCount" class="item">
+          <el-icon style="margin-right: 10px;">
+            <svg-icon name="icon-overView-message" />
+          </el-icon>
+        </el-badge>
+      </div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -71,6 +90,7 @@
   opacity: 1;
   align-items: center;
   transition: opacity 0.2s;
+  z-index: 10;
 }
 
 .carousel-item {
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index f17c0c1..cd200bd 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -429,7 +429,7 @@
 
     <normal-table
       :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      is-showmulti-select @change="changePage"
+      is-showmulti-select height="320" @change="changePage"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }
diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue
index 3f95d30..b4bcbcd 100644
--- a/src/views/laboratory/overview/components/message.vue
+++ b/src/views/laboratory/overview/components/message.vue
@@ -2,6 +2,8 @@
 <script setup lang="ts" name="MessageScrolling">
 import { ref } from 'vue'
 import { getOverviewAlarmDetail } from '@/api/laboratory/overView'
+const $router = useRouter()
+
 const form = ref({
   confirmedCount: 0, // 已确认报警数量
   unconfirmedCount: 0, // 未确认报警数量
@@ -18,6 +20,14 @@
     form.value.currentAlarmCount = res.data.confirmedCount + res.data.unconfirmedCount // 当前报警数 =已确认 + 未确认
   })
 }
+
+// 点击报警标识
+const goCurrentAlarm = () => {
+  $router.push({
+    path: '/labAlarm/currentList',
+  })
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -34,26 +44,35 @@
       </el-icon>
       <span style="color: #444c59;margin-left: 20px;">报警总数<span style="margin-left: 16px;color: red;font-weight: 600;">{{ form.alarmTotal }}</span></span>
       <!-- 未确认  -->
-      <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
-        {{ form.unconfirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="未确认" placement="top-start">
+        <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
+          {{ form.unconfirmedCount }}
+        </el-button>
+      </el-tooltip>
+
       <!-- 已确认  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
-        {{ form.confirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已确认" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
+          {{ form.confirmedCount }}
+        </el-button>
+      </el-tooltip>
       <!-- 已消警  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
-        {{ form.canceledCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已消警" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
+          {{ form.canceledCount }}
+        </el-button>
+      </el-tooltip>
     </div>
     <!-- 当前报警  -->
-    <div style="padding-right: 60px;">
-      <el-badge :value="form.currentAlarmCount" class="item">
-        <el-icon style="margin-right: 10px;">
-          <svg-icon name="icon-overView-message" />
-        </el-icon>
-      </el-badge>
-    </div>
+    <el-tooltip class="item" effect="dark" content="当前告警" placement="left-start">
+      <div style="padding-right: 40px;cursor: pointer;z-index: 9;" @click="goCurrentAlarm">
+        <el-badge :value="form.currentAlarmCount" class="item">
+          <el-icon style="margin-right: 10px;">
+            <svg-icon name="icon-overView-message" />
+          </el-icon>
+        </el-badge>
+      </div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -71,6 +90,7 @@
   opacity: 1;
   align-items: center;
   transition: opacity 0.2s;
+  z-index: 10;
 }
 
 .carousel-item {
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index f17c0c1..cd200bd 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -429,7 +429,7 @@
 
     <normal-table
       :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      is-showmulti-select @change="changePage"
+      is-showmulti-select height="320" @change="changePage"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index f82b15f..c9abc80 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -26,7 +26,7 @@
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
-  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '所属实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
@@ -140,10 +140,10 @@
       <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-form-item label="所属实验室:" prop="locationLab">
         <el-select
           v-model="form.locationLab"
-          placeholder="请选择地点实验室"
+          placeholder="请选择所属实验室"
           filterable
           clearable
           :disabled="pageType === 'detail'"

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }
diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue
index 3f95d30..b4bcbcd 100644
--- a/src/views/laboratory/overview/components/message.vue
+++ b/src/views/laboratory/overview/components/message.vue
@@ -2,6 +2,8 @@
 <script setup lang="ts" name="MessageScrolling">
 import { ref } from 'vue'
 import { getOverviewAlarmDetail } from '@/api/laboratory/overView'
+const $router = useRouter()
+
 const form = ref({
   confirmedCount: 0, // 已确认报警数量
   unconfirmedCount: 0, // 未确认报警数量
@@ -18,6 +20,14 @@
     form.value.currentAlarmCount = res.data.confirmedCount + res.data.unconfirmedCount // 当前报警数 =已确认 + 未确认
   })
 }
+
+// 点击报警标识
+const goCurrentAlarm = () => {
+  $router.push({
+    path: '/labAlarm/currentList',
+  })
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -34,26 +44,35 @@
       </el-icon>
       <span style="color: #444c59;margin-left: 20px;">报警总数<span style="margin-left: 16px;color: red;font-weight: 600;">{{ form.alarmTotal }}</span></span>
       <!-- 未确认  -->
-      <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
-        {{ form.unconfirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="未确认" placement="top-start">
+        <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
+          {{ form.unconfirmedCount }}
+        </el-button>
+      </el-tooltip>
+
       <!-- 已确认  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
-        {{ form.confirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已确认" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
+          {{ form.confirmedCount }}
+        </el-button>
+      </el-tooltip>
       <!-- 已消警  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
-        {{ form.canceledCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已消警" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
+          {{ form.canceledCount }}
+        </el-button>
+      </el-tooltip>
     </div>
     <!-- 当前报警  -->
-    <div style="padding-right: 60px;">
-      <el-badge :value="form.currentAlarmCount" class="item">
-        <el-icon style="margin-right: 10px;">
-          <svg-icon name="icon-overView-message" />
-        </el-icon>
-      </el-badge>
-    </div>
+    <el-tooltip class="item" effect="dark" content="当前告警" placement="left-start">
+      <div style="padding-right: 40px;cursor: pointer;z-index: 9;" @click="goCurrentAlarm">
+        <el-badge :value="form.currentAlarmCount" class="item">
+          <el-icon style="margin-right: 10px;">
+            <svg-icon name="icon-overView-message" />
+          </el-icon>
+        </el-badge>
+      </div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -71,6 +90,7 @@
   opacity: 1;
   align-items: center;
   transition: opacity 0.2s;
+  z-index: 10;
 }
 
 .carousel-item {
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index f17c0c1..cd200bd 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -429,7 +429,7 @@
 
     <normal-table
       :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      is-showmulti-select @change="changePage"
+      is-showmulti-select height="320" @change="changePage"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index f82b15f..c9abc80 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -26,7 +26,7 @@
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
-  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '所属实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
@@ -140,10 +140,10 @@
       <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-form-item label="所属实验室:" prop="locationLab">
         <el-select
           v-model="form.locationLab"
-          placeholder="请选择地点实验室"
+          placeholder="请选择所属实验室"
           filterable
           clearable
           :disabled="pageType === 'detail'"
diff --git a/src/views/laboratory/place/list.vue b/src/views/laboratory/place/list.vue
index 193ddf2..92501b1 100644
--- a/src/views/laboratory/place/list.vue
+++ b/src/views/laboratory/place/list.vue
@@ -21,7 +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: 'locationLab', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])

diff --git a/src/views/laboratory/alarm/event/addEventDialog.vue b/src/views/laboratory/alarm/event/addEventDialog.vue
index f42266e..5ab2ef0 100644
--- a/src/views/laboratory/alarm/event/addEventDialog.vue
+++ b/src/views/laboratory/alarm/event/addEventDialog.vue
@@ -73,7 +73,7 @@
   pageType.value = pageTypeParam // 页面类型
   form.value.createUserId = user.id// 创建人id
   form.value.createUser = user.name // 创建人名字
-  if (pageTypeParam === 'edit') { // 编辑时初始化数据
+  if (pageTypeParam === 'edit' || pageTypeParam === 'detail') { // 编辑时初始化数据
     form.value.deviceType = row.deviceType //	设备类型(字典code)
     form.value.eventDesc = row.eventDesc //	事件描述
     form.value.eventName = row.eventName //	事件名称
@@ -170,6 +170,8 @@
           v-model="form.firstLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '一级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="二级报警(%):" prop="secondLevelAlarm">
@@ -177,6 +179,8 @@
           v-model="form.secondLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '二级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="三级报警(%):" prop="thirdLevelAlarm">
@@ -184,6 +188,8 @@
           v-model="form.thirdLevelAlarm"
           :placeholder="pageType === 'detail' ? '' : '三级报警(%)'"
           :disabled="pageType === 'detail'"
+          :min="0"
+          :max="100"
         />
       </el-form-item>
       <el-form-item label="事件描述:" prop="eventDesc">
diff --git a/src/views/laboratory/alarm/record/list.vue b/src/views/laboratory/alarm/record/list.vue
index 60bfcf0..d612b84 100644
--- a/src/views/laboratory/alarm/record/list.vue
+++ b/src/views/laboratory/alarm/record/list.vue
@@ -11,7 +11,7 @@
 const loadingTable = ref(false)
 const alarmStatusMap = [ // 报警状态
   {
-    value: '',
+    value: 'null',
     name: '全部',
   },
   {
@@ -82,47 +82,6 @@
   }).catch(() => {
     loadingTable.value = false
   })
-  list.value = [{
-    alarmLevel: 'test1', //	报警等级
-    alarmStatus: 'test1', //	报警状态(字典code)
-    alarmStatusName: '未确认', //	报警状态(字典value)
-    alarmTime: 'test1', //	报警时间
-    alarmValue: 'test1', //	报警数值
-    createTime: 'test1', //	创建时间
-    deptId: 'test1', //	负责部门id
-    deptName: 'test1', //	负责部门
-    deviceId: 'test1', //	设备表id
-    deviceName: 'test1', //	设备名称
-    deviceNo: 'test1', //	设备编号
-    eventName: 'test1', //	事件名称
-    id: 'test11', //	主键id
-    locationId: 'test1', //	安装地点id
-    locationName: 'test1', //	安装地点
-    updateTime: 'test1', //	更新时间
-    userId: 'test1', //	负责人id
-    userName: 'test1', //	负责人
-  },
-  {
-    alarmLevel: 'test2', //	报警等级
-    alarmStatus: 'test2', //	报警状态(字典code)
-    alarmStatusName: '已确认', //	报警状态(字典value)
-    alarmTime: 'test2', //	报警时间
-    alarmValue: 'test2', //	报警数值
-    createTime: 'test2', //	创建时间
-    deptId: 'test2', //	负责部门id
-    deptName: 'test2', //	负责部门
-    deviceId: 'test2', //	设备表id
-    deviceName: 'test2', //	设备名称
-    deviceNo: 'test2', //	设备编号
-    eventName: 'test2', //	事件名称
-    id: 'test22', //	主键id
-    locationId: 'test2', //	安装地点id
-    locationName: 'test2', //	安装地点
-    updateTime: 'test2', //	更新时间
-    userId: 'test2', //	负责人id
-    userName: 'test2', //	负责人
-  },
-  ]
 }
 // 清除条件
 const clearList = () => {
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8d2b88a..1d24ed1 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -39,6 +39,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '温度（℃）', value: 'temperature', align: 'center' },
       { text: '湿度（%）', value: 'humidity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.temperatureHumidityList,
@@ -51,13 +52,15 @@
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
-      { text: 'A相电压', value: 'voltageA', align: 'center' },
-      { text: 'B相电压', value: 'voltageB', align: 'center' },
-      { text: 'C相电压', value: 'voltageC', align: 'center' },
-      { text: 'A相电流', value: 'currentA', align: 'center' },
-      { text: 'B相电流', value: 'currentB', align: 'center' },
-      { text: 'C相电流', value: 'currentC', align: 'center' },
-      { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '电压', value: 'voltageA', align: 'center' },
+      // { text: 'A相电压', value: 'voltageA', align: 'center' },
+      // { text: 'B相电压', value: 'voltageB', align: 'center' },
+      // { text: 'C相电压', value: 'voltageC', align: 'center' },
+      // { text: 'A相电流', value: 'currentA', align: 'center' },
+      // { text: 'B相电流', value: 'currentB', align: 'center' },
+      // { text: 'C相电流', value: 'currentC', align: 'center' },
+      // { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.electricQuantityList,
@@ -73,6 +76,7 @@
       { text: '安装地点', value: 'locationName', align: 'center' },
       { text: '氧气浓度（ppm）', value: 'oxygenDensity', align: 'center' },
       { text: '电量（%）', value: 'electricQuantity', align: 'center' },
+      // { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: ISmokeList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.oxygenList,
diff --git a/src/views/laboratory/equipment/config/addElectricQuantity.vue b/src/views/laboratory/equipment/config/addElectricQuantity.vue
index 6fc749a..bec37cb 100644
--- a/src/views/laboratory/equipment/config/addElectricQuantity.vue
+++ b/src/views/laboratory/equipment/config/addElectricQuantity.vue
@@ -1,4 +1,4 @@
-<!-- 新增温湿度网络传感器 -->
+<!-- 新增智能电量仪 -->
 <script lang="ts" setup name="AddElectricQuantity">
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Ref } from 'vue'
@@ -161,6 +161,7 @@
 const listQuery: Ref<IListQuery> = ref({
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
+  deviceType: '2', //	设备类型(字典code)
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
@@ -179,7 +180,7 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
+
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -194,6 +195,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
@@ -317,6 +319,27 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12" style="display: flex;justify-content: flex-start;">
+          <el-form-item label="电压(V):" prop="minVoltageA">
+            <el-input-number
+              v-model="form.minVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压下限'"
+              :disabled="pageType === 'detail'"
+              style="width: 154px;"
+            />
+          </el-form-item>
+          <span style="margin-left: 10px;line-height: 30px;"> —— </span>
+          <el-form-item label-width="10" prop="maxVoltageA">
+            <el-input-number
+              v-model="form.maxVoltageA"
+              :placeholder="pageType === 'detail' ? '' : '电压上限'"
+              :disabled="pageType === 'detail'"
+              :max="100"
+              style="width: 154px;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="12" style="display: flex;justify-content: flex-start;">
           <el-form-item label="A相电压(V):" prop="minVoltageA">
             <el-input-number
               v-model="form.minVoltageA"
@@ -626,7 +649,7 @@
               style="width: 154px;"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/laboratory/equipment/config/addOxygenSmoke.vue b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
index ec965e7..77ddd4d 100644
--- a/src/views/laboratory/equipment/config/addOxygenSmoke.vue
+++ b/src/views/laboratory/equipment/config/addOxygenSmoke.vue
@@ -60,6 +60,7 @@
   deptId: '', // 负责部门id（西昌组织下拉选择）
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
+  deviceType: '', //	设备类型(字典code)
   deviceStatus: '', // 在线状态（1在线0离线）
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
@@ -77,7 +78,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -99,6 +99,8 @@
     infoId.value = '' // 主键
   }
   form.value.deviceName = type === 'oxygen' ? '氧气传感器' : '烟雾报警器' // 设备名称
+  listQuery.value.deviceType = type === 'oxygen' ? '3' : '4'
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
index 7a3a09b..6093abc 100644
--- a/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
+++ b/src/views/laboratory/equipment/config/addTemperatureHumidity.vue
@@ -93,6 +93,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '1', //	设备类型(字典code)
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   ids: [],
   limit: 999999,
@@ -109,7 +110,6 @@
     deviceList.value = response.data.rows
   })
 }
-fetchData() // 获取设备列表
 // -------------------------------------------------------------------------------------------------
 // 弹窗初始化
 const initDialog = (pageTypeParam = 'detail', type: string, row: any) => {
@@ -134,6 +134,7 @@
     clear()
     infoId.value = '' // 主键
   }
+  fetchData() // 获取设备列表
 }
 
 // 设备编号选中值变化
diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue
index bee30dd..5ea93e2 100644
--- a/src/views/laboratory/equipment/config/list.vue
+++ b/src/views/laboratory/equipment/config/list.vue
@@ -53,7 +53,7 @@
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
-      { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
+      // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' },
       { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' },
       { text: 'IP地址', value: 'ip', align: 'center' },
       { text: '端口', value: 'port', align: 'center' },
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 5c54847..350516c 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -33,6 +33,8 @@
   userId: '', // 负责人id
   locationId: '', // 安装地点id
   locationName: '', // 安装地点名称
+  locationPosition: '', // 地点位置
+  locationLab: '', // 所属实验室
   detailLocation: '', // 详细位置
   technicalParam: '', // 技术参数
   remark: '', // 备注
@@ -135,7 +137,9 @@
 const confirmSelectLocation = (val: any) => {
   form.value.locationId = val[0].id // 安装地点id
   form.value.locationName = val[0].locationName // 安装地点名称
-  form.value.detailLocation = val[0].locationPosition // 详细位置
+  // form.value.detailLocation = val[0].locationPosition // 详细位置
+  form.value.locationPosition = val[0].locationPosition // 地点位置
+  form.value.locationLab = val[0].locationLab // 所属实验室
 }
 
 // 点击选择地点
@@ -257,6 +261,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="地点位置:">
+              <el-input v-model="form.locationPosition" class="full-width-input" disabled placeholder="地点位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属实验室:">
+              <el-input v-model="form.locationLab" class="full-width-input" disabled placeholder="所属实验室" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
diff --git a/src/views/laboratory/equipment/list/list-interface.ts b/src/views/laboratory/equipment/list/list-interface.ts
index 973368b..16764b7 100644
--- a/src/views/laboratory/equipment/list/list-interface.ts
+++ b/src/views/laboratory/equipment/list/list-interface.ts
@@ -3,6 +3,7 @@
   deviceName: string // 设备名称
   deviceNo: string // 设备编号
   deviceStatus: string // 在线状态（1在线0离线）
+  deviceType?: string // 设备类型
   userId: string // 负责人id（西昌组织下人员下拉选择）
   limit: number
   offset: number
@@ -29,6 +30,8 @@
   userId: string // 负责人id
   locationId: string // 安装地点id
   locationName: string // 安装地点名称
+  locationPosition: string // 地点位置
+  locationLab: string // 所属实验室
   detailLocation: string // 详细位置
   technicalParam: string // 技术参数
   remark: string // 备注
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index 0fbe3fe..ebfd26a 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -31,6 +31,8 @@
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
+  { text: '地点位置', value: 'locationPosition', align: 'center' },
+  { text: '所属实验室', value: 'locationLab', align: 'center' },
   { text: '详细位置', value: 'detailLocation', align: 'center' },
   { text: '负责部门', value: 'deptName', align: 'center' },
   { text: '负责人', value: 'userName', align: 'center' },
@@ -43,7 +45,7 @@
 // -----------------------------------------字典--------------------------------------------------------------
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
-const deviceStatusList = ref<dictType[]>([]) // 在线状态
+const deviceStatusList = ref([]) as any // 在线状态
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -67,7 +69,7 @@
     deviceStatusList.value = response.data
     deviceStatusList.value.unshift({
       name: '全部',
-      value: '',
+      value: null,
     })
   })
 }
diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue
index 3f95d30..b4bcbcd 100644
--- a/src/views/laboratory/overview/components/message.vue
+++ b/src/views/laboratory/overview/components/message.vue
@@ -2,6 +2,8 @@
 <script setup lang="ts" name="MessageScrolling">
 import { ref } from 'vue'
 import { getOverviewAlarmDetail } from '@/api/laboratory/overView'
+const $router = useRouter()
+
 const form = ref({
   confirmedCount: 0, // 已确认报警数量
   unconfirmedCount: 0, // 未确认报警数量
@@ -18,6 +20,14 @@
     form.value.currentAlarmCount = res.data.confirmedCount + res.data.unconfirmedCount // 当前报警数 =已确认 + 未确认
   })
 }
+
+// 点击报警标识
+const goCurrentAlarm = () => {
+  $router.push({
+    path: '/labAlarm/currentList',
+  })
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -34,26 +44,35 @@
       </el-icon>
       <span style="color: #444c59;margin-left: 20px;">报警总数<span style="margin-left: 16px;color: red;font-weight: 600;">{{ form.alarmTotal }}</span></span>
       <!-- 未确认  -->
-      <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
-        {{ form.unconfirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="未确认" placement="top-start">
+        <el-button size="small" type="primary" style="margin-left: 32px;padding: 0 20px;background-color: #ec808d;border: none;">
+          {{ form.unconfirmedCount }}
+        </el-button>
+      </el-tooltip>
+
       <!-- 已确认  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
-        {{ form.confirmedCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已确认" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;">
+          {{ form.confirmedCount }}
+        </el-button>
+      </el-tooltip>
       <!-- 已消警  -->
-      <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
-        {{ form.canceledCount }}
-      </el-button>
+      <el-tooltip class="item" effect="dark" content="已消警" placement="top-start">
+        <el-button size="small" type="success" style="margin-left: 32px;padding: 0 20px;background-color: #d9001b;border: none;">
+          {{ form.canceledCount }}
+        </el-button>
+      </el-tooltip>
     </div>
     <!-- 当前报警  -->
-    <div style="padding-right: 60px;">
-      <el-badge :value="form.currentAlarmCount" class="item">
-        <el-icon style="margin-right: 10px;">
-          <svg-icon name="icon-overView-message" />
-        </el-icon>
-      </el-badge>
-    </div>
+    <el-tooltip class="item" effect="dark" content="当前告警" placement="left-start">
+      <div style="padding-right: 40px;cursor: pointer;z-index: 9;" @click="goCurrentAlarm">
+        <el-badge :value="form.currentAlarmCount" class="item">
+          <el-icon style="margin-right: 10px;">
+            <svg-icon name="icon-overView-message" />
+          </el-icon>
+        </el-badge>
+      </div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -71,6 +90,7 @@
   opacity: 1;
   align-items: center;
   transition: opacity 0.2s;
+  z-index: 10;
 }
 
 .carousel-item {
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index f17c0c1..cd200bd 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -429,7 +429,7 @@
 
     <normal-table
       :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      is-showmulti-select @change="changePage"
+      is-showmulti-select height="320" @change="changePage"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/laboratory/place/addDialog.vue b/src/views/laboratory/place/addDialog.vue
index f82b15f..c9abc80 100644
--- a/src/views/laboratory/place/addDialog.vue
+++ b/src/views/laboratory/place/addDialog.vue
@@ -26,7 +26,7 @@
   locationNo: [{ required: true, message: '地点编号不能为空', trigger: 'blur' }],
   locationName: [{ required: true, message: '地点名称不能为空', trigger: 'blur' }],
   locationPosition: [{ required: true, message: '地点位置不能为空', trigger: 'blur' }],
-  locationLab: [{ required: true, message: '地点实验室不能为空', trigger: 'blur' }],
+  locationLab: [{ required: true, message: '所属实验室不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref(false) // 弹窗显示
 const pageType = ref('') // 页面类型 add新增、edit编辑
@@ -140,10 +140,10 @@
       <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-form-item label="所属实验室:" prop="locationLab">
         <el-select
           v-model="form.locationLab"
-          placeholder="请选择地点实验室"
+          placeholder="请选择所属实验室"
           filterable
           clearable
           :disabled="pageType === 'detail'"
diff --git a/src/views/laboratory/place/list.vue b/src/views/laboratory/place/list.vue
index 193ddf2..92501b1 100644
--- a/src/views/laboratory/place/list.vue
+++ b/src/views/laboratory/place/list.vue
@@ -21,7 +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: '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 2cfef34..d13e8e9 100644
--- a/src/views/laboratory/place/place-interface.ts
+++ b/src/views/laboratory/place/place-interface.ts
@@ -13,7 +13,7 @@
   createUser: string // 创建人
   createUserId: string// 创建人id
   createTime: string // 创建时间
-  locationLab: string // 地点实验室
+  locationLab: string //
 }
 
 export interface IForm {