diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 3e64dd1..570f35a 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -32,3 +32,12 @@
     responseType: 'blob',
   })
 }
+
+// 查询ups监测详情
+export function getUpsMonitorDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/ups/monitor/detail`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 3e64dd1..570f35a 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -32,3 +32,12 @@
     responseType: 'blob',
   })
 }
+
+// 查询ups监测详情
+export function getUpsMonitorDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/ups/monitor/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 77e6179..5fc1842 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -103,7 +103,7 @@
     },
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
+const emit = defineEmits(['cellClick', 'change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -159,6 +159,9 @@
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
 }
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emit('cellClick', row, column, cell, event)
+}
 // 监听columns
 watch(props.columns, (val) => {
   initColumnsState()
@@ -232,6 +235,7 @@
       @select="selectClick"
       @row-click="rowClick"
       @sort-change="sortClick"
+      @cell-click="cellClick"
     >
       <slot name="preColumns" />
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 3e64dd1..570f35a 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -32,3 +32,12 @@
     responseType: 'blob',
   })
 }
+
+// 查询ups监测详情
+export function getUpsMonitorDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/ups/monitor/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 77e6179..5fc1842 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -103,7 +103,7 @@
     },
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
+const emit = defineEmits(['cellClick', 'change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -159,6 +159,9 @@
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
 }
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emit('cellClick', row, column, cell, event)
+}
 // 监听columns
 watch(props.columns, (val) => {
   initColumnsState()
@@ -232,6 +235,7 @@
       @select="selectClick"
       @row-click="rowClick"
       @sort-change="sortClick"
+      @cell-click="cellClick"
     >
       <slot name="preColumns" />
 
diff --git a/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
new file mode 100644
index 0000000..7d4fa50
--- /dev/null
+++ b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
@@ -0,0 +1,212 @@
+<!-- ups监测详情 -->
+<script lang="ts" setup name="UPSMonitorDetail">
+import { getUpsMonitorDetail } from '@/api/laboratory/data'
+import useUserStore from '@/store/modules/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['refresh'])
+const user = useUserStore() // 用户信息
+const loadingTable = ref(false)
+const dialogVisible = ref(false) // 弹窗显隐
+
+const unitMap = { // 单位map
+  A相电流: 'A',
+  A相电压: 'V',
+  AB线电压: 'V',
+  B相电流: 'A',
+  B相电压: 'V',
+  BC线电压: 'V',
+  C相电流: 'A',
+  C相电压: 'A',
+  CA线电压: 'A',
+
+  交流相电压: 'V',
+  总交流输入电流: 'A',
+  总交流频率: 'Hz',
+  总交流功率因数: '',
+  A相输出电流: 'A',
+  A相输出负载: '%',
+  A相输出电压: 'V',
+  B相输出电流: 'A',
+  B相输出负载: '%',
+  B相输出电压: 'V',
+  C相输出电流: 'A',
+  C相输出负载: '%',
+  C相输出电压: 'V',
+  AC线电压: 'V',
+
+  电池电压: 'V',
+  电池电流: 'A',
+  输出负载百分比: '%',
+  UPS内部温度: '℃',
+
+  电压: 'V',
+  温度: '℃',
+  存储内阻: 'mΩ',
+
+  频率: 'Hz',
+
+  // 功率
+  A相有功功率: 'KW',
+  B相有功功率: 'KW',
+  C相有功功率: 'KW',
+  总有功功率: 'KW',
+
+  A相无功功率: 'Kvar',
+  B相无功功率: 'Kvar',
+  C相无功功率: 'Kvar',
+  总无功功率: 'Kvar',
+
+  总交流有功功率: 'KW',
+  总交流视在功率: 'KVA',
+  总视在功率: 'KVA',
+
+  正向有功电度: 'KWh',
+  反向有功电度: 'KWh',
+
+  浓度: 'g/L',
+  回风湿度: '%',
+  设定湿度: '%',
+  回风湿度上限: '%',
+  回风湿度下限: '%',
+  回风温度: '℃',
+  设定温度: '℃',
+  回风温度上限: '℃',
+  回风温度下限: '℃',
+  风机运行时间: 'h',
+  压机1运行时间: 'h',
+  压机2运行时间: 'h',
+  加湿电流: 'h',
+} as any
+const columnsParams = ref([ // 参数表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '值', value: 'curValue', align: 'center' },
+  { text: '单位', value: 'unit', align: 'center' },
+])
+
+const columnsStatus = ref<TableColumn[]>([ // 状态表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '状态', value: 'valueDecript', align: 'center', styleFilter: (row: any) => { return `${row.valueDecript}` === '未运行' ? 'color: red' : `${row.valueDecript}` === '正常' ? 'color: #00a846' : `${row.valueDecript}` === '运行' ? 'color: #eeb63c' : '' } },
+  { text: '参数值', value: 'curValue', align: 'center' },
+])
+
+const paramsList = ref([]) as any // 参数表格
+const statusList = ref([]) // 状态表格
+
+const radioMenus = ref([ // 标签内容
+  { name: '参数', value: 'params' },
+  { name: '状态', value: 'status' },
+])
+const current = ref('params') // 选择的tab 默认基本信息
+// ----------------------------------------方法-------------------------------------------------
+// 数据查询
+function fetchData(id: string) {
+  loadingTable.value = true
+  getUpsMonitorDetail({ id }).then((response) => {
+    if (response && response.data && response.data.length) {
+      paramsList.value = response.data.filter((item: { valueDecript: string }) => !item.valueDecript)
+      paramsList.value = paramsList.value.map((item: { paramName: string }) => {
+        return {
+          ...item,
+          unit: unitMap[item.paramName],
+        }
+      })
+      statusList.value = response.data.filter((item: { valueDecript: string }) => item.valueDecript)
+    }
+    loadingTable.value = false
+  })
+}
+
+// 弹窗初始化
+const initDialog = (id: string) => {
+  dialogVisible.value = true // 打开弹窗
+  fetchData(id)
+}
+
+// 关闭
+const close = () => {
+  dialogVisible.value = false
+}
+// --------------------------------------钩子---------------------------------------
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" append-to-body width="65%" class="container">
+    <div style="display: flex;justify-content: space-between;">
+      <el-radio-group v-model="current" style="margin-bottom: 20px;">
+        <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <el-table
+      v-show="current === 'params'"
+      v-loading="loadingTable"
+      :data="paramsList"
+      border
+      max-height="400"
+      style="width: 100%;"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsParams"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      />
+    </el-table>
+    <el-table
+      v-show="current === 'status'"
+      v-loading="loadingTable"
+      :data="statusList"
+      border
+      style="width: 100%;"
+      max-height="400"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsStatus"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      >
+        <template #default="scope">
+          <span v-if="!item.filter" :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ scope.row[item.value] }}</span>
+          <span v-else :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ item.filter(scope.row) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer footer">
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
+</style>

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 3e64dd1..570f35a 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -32,3 +32,12 @@
     responseType: 'blob',
   })
 }
+
+// 查询ups监测详情
+export function getUpsMonitorDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/ups/monitor/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 77e6179..5fc1842 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -103,7 +103,7 @@
     },
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
+const emit = defineEmits(['cellClick', 'change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -159,6 +159,9 @@
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
 }
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emit('cellClick', row, column, cell, event)
+}
 // 监听columns
 watch(props.columns, (val) => {
   initColumnsState()
@@ -232,6 +235,7 @@
       @select="selectClick"
       @row-click="rowClick"
       @sort-change="sortClick"
+      @cell-click="cellClick"
     >
       <slot name="preColumns" />
 
diff --git a/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
new file mode 100644
index 0000000..7d4fa50
--- /dev/null
+++ b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
@@ -0,0 +1,212 @@
+<!-- ups监测详情 -->
+<script lang="ts" setup name="UPSMonitorDetail">
+import { getUpsMonitorDetail } from '@/api/laboratory/data'
+import useUserStore from '@/store/modules/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['refresh'])
+const user = useUserStore() // 用户信息
+const loadingTable = ref(false)
+const dialogVisible = ref(false) // 弹窗显隐
+
+const unitMap = { // 单位map
+  A相电流: 'A',
+  A相电压: 'V',
+  AB线电压: 'V',
+  B相电流: 'A',
+  B相电压: 'V',
+  BC线电压: 'V',
+  C相电流: 'A',
+  C相电压: 'A',
+  CA线电压: 'A',
+
+  交流相电压: 'V',
+  总交流输入电流: 'A',
+  总交流频率: 'Hz',
+  总交流功率因数: '',
+  A相输出电流: 'A',
+  A相输出负载: '%',
+  A相输出电压: 'V',
+  B相输出电流: 'A',
+  B相输出负载: '%',
+  B相输出电压: 'V',
+  C相输出电流: 'A',
+  C相输出负载: '%',
+  C相输出电压: 'V',
+  AC线电压: 'V',
+
+  电池电压: 'V',
+  电池电流: 'A',
+  输出负载百分比: '%',
+  UPS内部温度: '℃',
+
+  电压: 'V',
+  温度: '℃',
+  存储内阻: 'mΩ',
+
+  频率: 'Hz',
+
+  // 功率
+  A相有功功率: 'KW',
+  B相有功功率: 'KW',
+  C相有功功率: 'KW',
+  总有功功率: 'KW',
+
+  A相无功功率: 'Kvar',
+  B相无功功率: 'Kvar',
+  C相无功功率: 'Kvar',
+  总无功功率: 'Kvar',
+
+  总交流有功功率: 'KW',
+  总交流视在功率: 'KVA',
+  总视在功率: 'KVA',
+
+  正向有功电度: 'KWh',
+  反向有功电度: 'KWh',
+
+  浓度: 'g/L',
+  回风湿度: '%',
+  设定湿度: '%',
+  回风湿度上限: '%',
+  回风湿度下限: '%',
+  回风温度: '℃',
+  设定温度: '℃',
+  回风温度上限: '℃',
+  回风温度下限: '℃',
+  风机运行时间: 'h',
+  压机1运行时间: 'h',
+  压机2运行时间: 'h',
+  加湿电流: 'h',
+} as any
+const columnsParams = ref([ // 参数表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '值', value: 'curValue', align: 'center' },
+  { text: '单位', value: 'unit', align: 'center' },
+])
+
+const columnsStatus = ref<TableColumn[]>([ // 状态表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '状态', value: 'valueDecript', align: 'center', styleFilter: (row: any) => { return `${row.valueDecript}` === '未运行' ? 'color: red' : `${row.valueDecript}` === '正常' ? 'color: #00a846' : `${row.valueDecript}` === '运行' ? 'color: #eeb63c' : '' } },
+  { text: '参数值', value: 'curValue', align: 'center' },
+])
+
+const paramsList = ref([]) as any // 参数表格
+const statusList = ref([]) // 状态表格
+
+const radioMenus = ref([ // 标签内容
+  { name: '参数', value: 'params' },
+  { name: '状态', value: 'status' },
+])
+const current = ref('params') // 选择的tab 默认基本信息
+// ----------------------------------------方法-------------------------------------------------
+// 数据查询
+function fetchData(id: string) {
+  loadingTable.value = true
+  getUpsMonitorDetail({ id }).then((response) => {
+    if (response && response.data && response.data.length) {
+      paramsList.value = response.data.filter((item: { valueDecript: string }) => !item.valueDecript)
+      paramsList.value = paramsList.value.map((item: { paramName: string }) => {
+        return {
+          ...item,
+          unit: unitMap[item.paramName],
+        }
+      })
+      statusList.value = response.data.filter((item: { valueDecript: string }) => item.valueDecript)
+    }
+    loadingTable.value = false
+  })
+}
+
+// 弹窗初始化
+const initDialog = (id: string) => {
+  dialogVisible.value = true // 打开弹窗
+  fetchData(id)
+}
+
+// 关闭
+const close = () => {
+  dialogVisible.value = false
+}
+// --------------------------------------钩子---------------------------------------
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" append-to-body width="65%" class="container">
+    <div style="display: flex;justify-content: space-between;">
+      <el-radio-group v-model="current" style="margin-bottom: 20px;">
+        <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <el-table
+      v-show="current === 'params'"
+      v-loading="loadingTable"
+      :data="paramsList"
+      border
+      max-height="400"
+      style="width: 100%;"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsParams"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      />
+    </el-table>
+    <el-table
+      v-show="current === 'status'"
+      v-loading="loadingTable"
+      :data="statusList"
+      border
+      style="width: 100%;"
+      max-height="400"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsStatus"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      >
+        <template #default="scope">
+          <span v-if="!item.filter" :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ scope.row[item.value] }}</span>
+          <span v-else :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ item.filter(scope.row) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer footer">
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
+</style>
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index 9ed8845..01f4f85 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -92,13 +92,20 @@
 
 // 列表请求参数
 export interface IListQuery {
-  deptId: string // 负责部门id（西昌组织下拉选择)
-  deviceName: string // 设备名称
-  deviceNo: string // 设备编号
-  uploadEndTime: string // 上传结束时间
-  uploadStartTime: string // 上传开始时间
-  userId: string // 负责人id（西昌组织下人员下拉选择）
-  labName: string // 所属实验室
+  deptId: string //	负责部门id（西昌组织下拉选择）
+  deviceName: string //	设备名称
+  deviceNo: string //	设备编号
+  labName: string //	所属实验室
+  startResistance: number | undefined //	起始内阻
+  endResistance: number | undefined //	结束内阻
+  startTemperature: number | undefined //	起始温度
+  endTemperature: number | undefined //	结束温度
+  startVoltage: number | undefined //	起始电压
+  endVoltage: number | undefined //	结束电压
+  uploadEndTime: string //	上传结束时间
+  uploadStartTime: string //	上传开始时间
+  userId: string //	负责人id（西昌组织下人员下拉选择）
+  status: string // ups监测列表状态
   limit: number
   offset: number
 }

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76b609d..e08940f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll.stylelint": "explicit"
   },
-  "stylelint.validate": [
-    "css",
-    "scss",
-    "vue"
-  ],
-  "editor.inlayHints.enabled": "off"
+  "stylelint.validate": ["css", "scss", "vue"],
+  "editor.inlayHints.enabled": "off",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 3e64dd1..570f35a 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -32,3 +32,12 @@
     responseType: 'blob',
   })
 }
+
+// 查询ups监测详情
+export function getUpsMonitorDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/ups/monitor/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 77e6179..5fc1842 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -103,7 +103,7 @@
     },
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
+const emit = defineEmits(['cellClick', 'change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -159,6 +159,9 @@
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
 }
+function cellClick(row: any, column: any, cell: any, event: any) {
+  emit('cellClick', row, column, cell, event)
+}
 // 监听columns
 watch(props.columns, (val) => {
   initColumnsState()
@@ -232,6 +235,7 @@
       @select="selectClick"
       @row-click="rowClick"
       @sort-change="sortClick"
+      @cell-click="cellClick"
     >
       <slot name="preColumns" />
 
diff --git a/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
new file mode 100644
index 0000000..7d4fa50
--- /dev/null
+++ b/src/views/laboratory/data/dialog/upsMonitorDetailDialog.vue
@@ -0,0 +1,212 @@
+<!-- ups监测详情 -->
+<script lang="ts" setup name="UPSMonitorDetail">
+import { getUpsMonitorDetail } from '@/api/laboratory/data'
+import useUserStore from '@/store/modules/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['refresh'])
+const user = useUserStore() // 用户信息
+const loadingTable = ref(false)
+const dialogVisible = ref(false) // 弹窗显隐
+
+const unitMap = { // 单位map
+  A相电流: 'A',
+  A相电压: 'V',
+  AB线电压: 'V',
+  B相电流: 'A',
+  B相电压: 'V',
+  BC线电压: 'V',
+  C相电流: 'A',
+  C相电压: 'A',
+  CA线电压: 'A',
+
+  交流相电压: 'V',
+  总交流输入电流: 'A',
+  总交流频率: 'Hz',
+  总交流功率因数: '',
+  A相输出电流: 'A',
+  A相输出负载: '%',
+  A相输出电压: 'V',
+  B相输出电流: 'A',
+  B相输出负载: '%',
+  B相输出电压: 'V',
+  C相输出电流: 'A',
+  C相输出负载: '%',
+  C相输出电压: 'V',
+  AC线电压: 'V',
+
+  电池电压: 'V',
+  电池电流: 'A',
+  输出负载百分比: '%',
+  UPS内部温度: '℃',
+
+  电压: 'V',
+  温度: '℃',
+  存储内阻: 'mΩ',
+
+  频率: 'Hz',
+
+  // 功率
+  A相有功功率: 'KW',
+  B相有功功率: 'KW',
+  C相有功功率: 'KW',
+  总有功功率: 'KW',
+
+  A相无功功率: 'Kvar',
+  B相无功功率: 'Kvar',
+  C相无功功率: 'Kvar',
+  总无功功率: 'Kvar',
+
+  总交流有功功率: 'KW',
+  总交流视在功率: 'KVA',
+  总视在功率: 'KVA',
+
+  正向有功电度: 'KWh',
+  反向有功电度: 'KWh',
+
+  浓度: 'g/L',
+  回风湿度: '%',
+  设定湿度: '%',
+  回风湿度上限: '%',
+  回风湿度下限: '%',
+  回风温度: '℃',
+  设定温度: '℃',
+  回风温度上限: '℃',
+  回风温度下限: '℃',
+  风机运行时间: 'h',
+  压机1运行时间: 'h',
+  压机2运行时间: 'h',
+  加湿电流: 'h',
+} as any
+const columnsParams = ref([ // 参数表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '值', value: 'curValue', align: 'center' },
+  { text: '单位', value: 'unit', align: 'center' },
+])
+
+const columnsStatus = ref<TableColumn[]>([ // 状态表头
+  { text: '参数名称', value: 'paramName', align: 'center', width: '160' },
+  { text: '状态', value: 'valueDecript', align: 'center', styleFilter: (row: any) => { return `${row.valueDecript}` === '未运行' ? 'color: red' : `${row.valueDecript}` === '正常' ? 'color: #00a846' : `${row.valueDecript}` === '运行' ? 'color: #eeb63c' : '' } },
+  { text: '参数值', value: 'curValue', align: 'center' },
+])
+
+const paramsList = ref([]) as any // 参数表格
+const statusList = ref([]) // 状态表格
+
+const radioMenus = ref([ // 标签内容
+  { name: '参数', value: 'params' },
+  { name: '状态', value: 'status' },
+])
+const current = ref('params') // 选择的tab 默认基本信息
+// ----------------------------------------方法-------------------------------------------------
+// 数据查询
+function fetchData(id: string) {
+  loadingTable.value = true
+  getUpsMonitorDetail({ id }).then((response) => {
+    if (response && response.data && response.data.length) {
+      paramsList.value = response.data.filter((item: { valueDecript: string }) => !item.valueDecript)
+      paramsList.value = paramsList.value.map((item: { paramName: string }) => {
+        return {
+          ...item,
+          unit: unitMap[item.paramName],
+        }
+      })
+      statusList.value = response.data.filter((item: { valueDecript: string }) => item.valueDecript)
+    }
+    loadingTable.value = false
+  })
+}
+
+// 弹窗初始化
+const initDialog = (id: string) => {
+  dialogVisible.value = true // 打开弹窗
+  fetchData(id)
+}
+
+// 关闭
+const close = () => {
+  dialogVisible.value = false
+}
+// --------------------------------------钩子---------------------------------------
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" append-to-body width="65%" class="container">
+    <div style="display: flex;justify-content: space-between;">
+      <el-radio-group v-model="current" style="margin-bottom: 20px;">
+        <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <el-table
+      v-show="current === 'params'"
+      v-loading="loadingTable"
+      :data="paramsList"
+      border
+      max-height="400"
+      style="width: 100%;"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsParams"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      />
+    </el-table>
+    <el-table
+      v-show="current === 'status'"
+      v-loading="loadingTable"
+      :data="statusList"
+      border
+      style="width: 100%;"
+      max-height="400"
+    >
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columnsStatus"
+        :key="item.value"
+        :prop="item.value"
+        :label="item.text"
+        :width="item.width"
+        align="center"
+      >
+        <template #default="scope">
+          <span v-if="!item.filter" :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ scope.row[item.value] }}</span>
+          <span v-else :style="item.styleFilter ? item.styleFilter(scope.row) : ''">{{ item.filter(scope.row) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer footer">
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
+</style>
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index 9ed8845..01f4f85 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -92,13 +92,20 @@
 
 // 列表请求参数
 export interface IListQuery {
-  deptId: string // 负责部门id（西昌组织下拉选择)
-  deviceName: string // 设备名称
-  deviceNo: string // 设备编号
-  uploadEndTime: string // 上传结束时间
-  uploadStartTime: string // 上传开始时间
-  userId: string // 负责人id（西昌组织下人员下拉选择）
-  labName: string // 所属实验室
+  deptId: string //	负责部门id（西昌组织下拉选择）
+  deviceName: string //	设备名称
+  deviceNo: string //	设备编号
+  labName: string //	所属实验室
+  startResistance: number | undefined //	起始内阻
+  endResistance: number | undefined //	结束内阻
+  startTemperature: number | undefined //	起始温度
+  endTemperature: number | undefined //	结束温度
+  startVoltage: number | undefined //	起始电压
+  endVoltage: number | undefined //	结束电压
+  uploadEndTime: string //	上传结束时间
+  uploadStartTime: string //	上传开始时间
+  userId: string //	负责人id（西昌组织下人员下拉选择）
+  status: string // ups监测列表状态
   limit: number
   offset: number
 }
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 8db5f6e..31818ec 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -11,6 +11,7 @@
   ITemperatureHumidityList,
   IUPSList,
 } from './list-interface'
+import upsMonitorDetailDialog from './dialog/upsMonitorDetailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 import useTemplateDownload from '@/utils/useTemplateDownload'
@@ -109,10 +110,10 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '所属实验室', value: 'labName', align: 'center' },
-      { text: '电压(V)', value: 'labName', align: 'center' },
-      { text: '内阻(mΩ)', value: 'labName', align: 'center' },
-      { text: '温度(℃)', value: 'labName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center', width: '120' },
+      { text: '电压(V)', value: 'voltage', align: 'center' },
+      { text: '内阻(mΩ)', value: 'resistance', align: 'center' },
+      { text: '温度(℃)', value: 'temperature', align: 'center' },
       { text: '状态', value: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
@@ -127,7 +128,7 @@
       { text: '负责部门', value: 'deptName', align: 'center' },
       { text: '负责人', value: 'userName', align: 'center' },
       { text: '安装地点', value: 'locationName', align: 'center' },
-      { text: '所属实验室', value: 'labName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center', width: '120' },
       { text: '参数', value: 'params', align: 'center', width: '160' },
       { text: '状态', value: 'upsMonitorDeviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.status}` === '1' ? 'color: red' : `${row.status}` === '0' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
@@ -141,13 +142,20 @@
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  deptId: '', // 负责部门id（西昌组织下拉选择)
-  deviceName: '', // 设备名称
-  deviceNo: '', // 设备编号
-  uploadEndTime: '', // 上传结束时间
-  uploadStartTime: '', // 上传开始时间
-  labName: user.lab, // 所属实验室
-  userId: '', // 负责人id（西昌组织下人员下拉选择）
+  deptId: '', //	负责部门id（西昌组织下拉选择）
+  deviceName: '', //	设备名称
+  deviceNo: '', //	设备编号
+  labName: user.lab, //	所属实验室
+  startResistance: undefined, //	起始内阻
+  endResistance: undefined, //	结束内阻
+  startTemperature: undefined, //	起始温度
+  endTemperature: undefined, //	结束温度
+  startVoltage: undefined, //	起始电压
+  endVoltage: undefined, //	结束电压
+  uploadEndTime: '', //	上传结束时间
+  uploadStartTime: '', //	上传开始时间
+  userId: '', //	负责人id（西昌组织下人员下拉选择）
+  status: '', // 状态
   limit: 20,
   offset: 1,
 })
@@ -206,13 +214,13 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string }) => {
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string; labName: string; resistance: string | number }) => {
       return {
         ...item,
         deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
         upsMonitorDeviceStatusName: `${item.status}` === '0' ? '正常' : `${item.status}` === '1' ? '异常' : '未知',
         params: '电池电压、电池电流...',
-        labName: listQuery.value.labName, // 所属实验室
+        resistance: item.labName === '海口实验室' ? '/' : item.resistance,
       }
     })
     total.value = parseInt(response.data.total)
@@ -222,13 +230,20 @@
 // 清除条件
 function clearList() {
   listQuery.value = {
-    deptId: '', // 负责部门id（西昌组织下拉选择)
-    deviceName: '', // 设备名称
-    deviceNo: '', // 设备编号
-    uploadEndTime: '', // 上传结束时间
-    uploadStartTime: '', // 上传开始时间
-    labName: user.lab, // 所属实验室
-    userId: '', // 负责人id（西昌组织下人员下拉选择）
+    deptId: '', //	负责部门id（西昌组织下拉选择）
+    deviceName: '', //	设备名称
+    deviceNo: '', //	设备编号
+    labName: user.lab, //	所属实验室
+    startResistance: undefined, //	起始内阻
+    endResistance: undefined, //	结束内阻
+    startTemperature: undefined, //	起始温度
+    endTemperature: undefined, //	结束温度
+    startVoltage: undefined, //	起始电压
+    endVoltage: undefined, //	结束电压
+    uploadEndTime: '', //	上传结束时间
+    uploadStartTime: '', //	上传开始时间
+    userId: '', //	负责人id（西昌组织下人员下拉选择）
+    status: '', // 状态
     limit: 20,
     offset: 1,
   }
@@ -260,13 +275,20 @@
   })
   if (menu.value[currentIndex.value].list.length > 0) {
     const params = {
-      deptId: listQuery.value.deptId, // 负责部门id（西昌组织下拉选择)
-      deviceName: listQuery.value.deviceName, // 设备名称
-      deviceNo: listQuery.value.deviceNo, // 设备编号
-      uploadEndTime: listQuery.value.uploadEndTime, // 上传结束时间
-      uploadStartTime: listQuery.value.uploadStartTime, // 上传开始时间
-      userId: listQuery.value.userId, // 负责人id（西昌组织下人员下拉选择）
-      labName: listQuery.value.labName, // 所属实验室
+      deptId: listQuery.value.deptId, //	负责部门id（西昌组织下拉选择）
+      deviceName: listQuery.value.deviceName, //	设备名称
+      deviceNo: listQuery.value.deviceNo, //	设备编号
+      labName: listQuery.value.labName, //	所属实验室
+      startResistance: listQuery.value.startResistance, //	起始内阻
+      endResistance: listQuery.value.endResistance, //	结束内阻
+      startTemperature: listQuery.value.startTemperature, //	起始温度
+      endTemperature: listQuery.value.endTemperature, //	结束温度
+      startVoltage: listQuery.value.startVoltage, //	起始电压
+      endVoltage: listQuery.value.endVoltage, //	结束电压
+      uploadEndTime: listQuery.value.uploadEndTime, //	上传结束时间
+      uploadStartTime: listQuery.value.uploadStartTime, //	上传开始时间
+      userId: listQuery.value.userId, //	负责人id（西昌组织下人员下拉选择）
+      status: listQuery.value.status, // ups监测列表状态
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -283,6 +305,19 @@
   }
 }
 
+// ---------------------------------ups检测详情------------------------------------------------
+const upsMonitorDetailDialogRef = ref() // ups检测详情组件ref
+// 点击详情
+const checkDetail = (id: string) => {
+  upsMonitorDetailDialogRef.value.initDialog(id)
+}
+
+// 点击列表单元格
+const cellClick = (row: any, column: any) => {
+  if (column.property === 'params' && row.id) {
+    upsMonitorDetailDialogRef.value.initDialog(row.id)
+  }
+}
 // ---------------------------------------钩子----------------------------------------------
 watch(dateRange, (val) => {
   if (val) {
@@ -344,13 +379,22 @@
         </el-select>
       </search-item>
       <search-item v-if="currentMenu === 'ups'">
-        <el-input v-model.trim="listQuery.deviceNo" placeholder="电压" class="short-input" clearable />
+        <el-input-number v-model="listQuery.startVoltage" placeholder="电压下限" :step="1" :precision="0" />
       </search-item>
       <search-item v-if="currentMenu === 'ups'">
-        <el-input v-model.trim="listQuery.deviceNo" placeholder="内阻" class="short-input" clearable />
+        <el-input-number v-model="listQuery.endVoltage" placeholder="电压上限" :step="1" :precision="0" />
       </search-item>
       <search-item v-if="currentMenu === 'ups'">
-        <el-input v-model.trim="listQuery.deviceNo" placeholder="温度" class="short-input" clearable />
+        <el-input-number v-model="listQuery.startResistance" placeholder="内阻下限" :step="1" :precision="0" />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input-number v-model="listQuery.endResistance" placeholder="内阻上限" :step="1" :precision="0" />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input-number v-model="listQuery.startTemperature" placeholder="温度下限" :step="1" :precision="0" />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input-number v-model="listQuery.endTemperature" placeholder="温度上限" :step="1" :precision="0" />
       </search-item>
       <search-item v-if="currentMenu === 'ups/monitor'">
         <el-select
@@ -360,7 +404,7 @@
           filterable
           clearable
         >
-          <el-option v-for="item in [{ name: '正常', value: '1' }, { name: '异常', value: '2' }]" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in [{ name: '正常', value: '0' }, { name: '异常', value: '1' }]" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -390,17 +434,39 @@
         is-showmulti-select
         @change="changePage"
         @multi-select="handleSelectionChange"
+        @cell-click="cellClick"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
+        <template v-if="currentMenu === 'ups/monitor'" #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            width="110"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="checkDetail(row.id)"
+              >
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
       </normal-table>
     </table-container>
   </app-container>
   <!-- 右上角按钮集合 -->
   <button-box :active="currentMenu" :menu="menu" @change-current-button="changeCurrentButton" />
+  <!-- ups监测详情 -->
+  <ups-monitor-detail-dialog ref="upsMonitorDetailDialogRef" />
 </template>