diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index fde23c3..9ed8845 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -87,6 +87,7 @@
   uploadTime: string //	上传时间
   userId: string //	负责人id
   userName: string //	负责人
+  status?: number | string // ups监测状态
 }
 
 // 列表请求参数

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index fde23c3..9ed8845 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -87,6 +87,7 @@
   uploadTime: string //	上传时间
   userId: string //	负责人id
   userName: string //	负责人
+  status?: number | string // ups监测状态
 }
 
 // 列表请求参数
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 386b755..8db5f6e 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -27,7 +27,8 @@
   electricQuantityList: ref<IElectricQuantityList[]>([]), // 智能电量仪
   oxygenList: ref<IOxygenList[]>([]), // 氧气传感器
   smokeList: ref<ISmokeList[]>([]), // 烟雾传感器
-  upsList: ref<IUPSList[]>([]), // 烟雾传感器
+  upsList: ref<IUPSList[]>([]), // UPS电源间电池
+  upsMonitorList: ref<IUPSList[]>([]), // UPS监测
 }
 const menu = ref([ // 菜单
   {
@@ -101,18 +102,38 @@
   },
   {
     id: 'ups',
-    name: 'UPS电源',
+    name: 'UPS电源间电池',
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { 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: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
   },
+  {
+    id: 'ups/monitor',
+    name: 'UPS监测',
+    columns: ref<TableColumn[]>([
+      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+      { text: '设备名称', value: 'deviceName', align: 'center' },
+      { text: '负责部门', value: 'deptName', align: 'center' },
+      { text: '负责人', value: 'userName', align: 'center' },
+      { text: '安装地点', value: 'locationName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center' },
+      { 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' },
+    ]),
+    list: listMap.upsMonitorList,
+  },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -185,10 +206,13 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string }) => {
       return {
         ...item,
         deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+        upsMonitorDeviceStatusName: `${item.status}` === '0' ? '正常' : `${item.status}` === '1' ? '异常' : '未知',
+        params: '电池电压、电池电流...',
+        labName: listQuery.value.labName, // 所属实验室
       }
     })
     total.value = parseInt(response.data.total)
@@ -308,6 +332,37 @@
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
+      <search-item v-if="currentMenu === 'ups' || currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.labName"
+          placeholder="所属实验室"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in ['西昌实验室', '海口实验室']" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="电压" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="内阻" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="温度" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.status"
+          placeholder="状态"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in [{ name: '正常', value: '1' }, { name: '异常', value: '2' }]" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="dateRange"

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index fde23c3..9ed8845 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -87,6 +87,7 @@
   uploadTime: string //	上传时间
   userId: string //	负责人id
   userName: string //	负责人
+  status?: number | string // ups监测状态
 }
 
 // 列表请求参数
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 386b755..8db5f6e 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -27,7 +27,8 @@
   electricQuantityList: ref<IElectricQuantityList[]>([]), // 智能电量仪
   oxygenList: ref<IOxygenList[]>([]), // 氧气传感器
   smokeList: ref<ISmokeList[]>([]), // 烟雾传感器
-  upsList: ref<IUPSList[]>([]), // 烟雾传感器
+  upsList: ref<IUPSList[]>([]), // UPS电源间电池
+  upsMonitorList: ref<IUPSList[]>([]), // UPS监测
 }
 const menu = ref([ // 菜单
   {
@@ -101,18 +102,38 @@
   },
   {
     id: 'ups',
-    name: 'UPS电源',
+    name: 'UPS电源间电池',
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { 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: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
   },
+  {
+    id: 'ups/monitor',
+    name: 'UPS监测',
+    columns: ref<TableColumn[]>([
+      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+      { text: '设备名称', value: 'deviceName', align: 'center' },
+      { text: '负责部门', value: 'deptName', align: 'center' },
+      { text: '负责人', value: 'userName', align: 'center' },
+      { text: '安装地点', value: 'locationName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center' },
+      { 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' },
+    ]),
+    list: listMap.upsMonitorList,
+  },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -185,10 +206,13 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string }) => {
       return {
         ...item,
         deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+        upsMonitorDeviceStatusName: `${item.status}` === '0' ? '正常' : `${item.status}` === '1' ? '异常' : '未知',
+        params: '电池电压、电池电流...',
+        labName: listQuery.value.labName, // 所属实验室
       }
     })
     total.value = parseInt(response.data.total)
@@ -308,6 +332,37 @@
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
+      <search-item v-if="currentMenu === 'ups' || currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.labName"
+          placeholder="所属实验室"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in ['西昌实验室', '海口实验室']" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="电压" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="内阻" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="温度" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.status"
+          placeholder="状态"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in [{ name: '正常', value: '1' }, { name: '异常', value: '2' }]" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="dateRange"
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 350516c..c2baf39 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -58,7 +58,7 @@
 
 // 获取字典值
 async function getDict() {
-// 设备类型
+  // 设备类型
   getDictByCode('deviceType').then((response) => {
     typeList.value = response.data
   })

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index fde23c3..9ed8845 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -87,6 +87,7 @@
   uploadTime: string //	上传时间
   userId: string //	负责人id
   userName: string //	负责人
+  status?: number | string // ups监测状态
 }
 
 // 列表请求参数
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 386b755..8db5f6e 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -27,7 +27,8 @@
   electricQuantityList: ref<IElectricQuantityList[]>([]), // 智能电量仪
   oxygenList: ref<IOxygenList[]>([]), // 氧气传感器
   smokeList: ref<ISmokeList[]>([]), // 烟雾传感器
-  upsList: ref<IUPSList[]>([]), // 烟雾传感器
+  upsList: ref<IUPSList[]>([]), // UPS电源间电池
+  upsMonitorList: ref<IUPSList[]>([]), // UPS监测
 }
 const menu = ref([ // 菜单
   {
@@ -101,18 +102,38 @@
   },
   {
     id: 'ups',
-    name: 'UPS电源',
+    name: 'UPS电源间电池',
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { 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: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
   },
+  {
+    id: 'ups/monitor',
+    name: 'UPS监测',
+    columns: ref<TableColumn[]>([
+      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+      { text: '设备名称', value: 'deviceName', align: 'center' },
+      { text: '负责部门', value: 'deptName', align: 'center' },
+      { text: '负责人', value: 'userName', align: 'center' },
+      { text: '安装地点', value: 'locationName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center' },
+      { 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' },
+    ]),
+    list: listMap.upsMonitorList,
+  },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -185,10 +206,13 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string }) => {
       return {
         ...item,
         deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+        upsMonitorDeviceStatusName: `${item.status}` === '0' ? '正常' : `${item.status}` === '1' ? '异常' : '未知',
+        params: '电池电压、电池电流...',
+        labName: listQuery.value.labName, // 所属实验室
       }
     })
     total.value = parseInt(response.data.total)
@@ -308,6 +332,37 @@
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
+      <search-item v-if="currentMenu === 'ups' || currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.labName"
+          placeholder="所属实验室"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in ['西昌实验室', '海口实验室']" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="电压" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="内阻" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="温度" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.status"
+          placeholder="状态"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in [{ name: '正常', value: '1' }, { name: '异常', value: '2' }]" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="dateRange"
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 350516c..c2baf39 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -58,7 +58,7 @@
 
 // 获取字典值
 async function getDict() {
-// 设备类型
+  // 设备类型
   getDictByCode('deviceType').then((response) => {
     typeList.value = response.data
   })
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index a15545a..5f067db 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -23,6 +23,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '', // 设备类型
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   labName: user.lab, // 所属实验室
   ids: [],
@@ -33,6 +34,7 @@
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
   { text: '地点位置', value: 'locationPosition', align: 'center' },
   { text: '所属实验室', value: 'locationLab', align: 'center' },
@@ -49,6 +51,7 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const deviceStatusList = ref([]) as any // 在线状态
+const deviceTypeList = ref([]) as any // 设备类型
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -63,6 +66,10 @@
 
   //   // deptPid.value = '0'
   // })
+  // 设备类型
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
   // 获取用户列表
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
     userList.value = res.data.rows
@@ -108,6 +115,7 @@
     deptId: '', // 负责部门id（西昌组织下拉选择）
     deviceName: '', // 设备名称
     deviceNo: '', // 设备编号
+    deviceType: '', // 设备类型
     deviceStatus: '', // 在线状态（1在线0离线）
     userId: '', // 负责人id（西昌组织下人员下拉选择）
     labName: user.lab, // 所属实验室
@@ -224,6 +232,7 @@
       deviceStatus: listQuery.value.deviceStatus, // 在线状态（1在线0离线）
       userId: listQuery.value.userId, // 负责人id（西昌组织下人员下拉选择）
       labName: listQuery.value.labName, // 所属实验室
+      deviceType: listQuery.value.deviceType, // 设备类型
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -268,6 +277,17 @@
           <el-input v-model.trim="listQuery.deviceName" placeholder="设备名称" class="short-input" clearable />
         </search-item>
         <search-item>
+          <el-select
+            v-model="listQuery.deviceType"
+            placeholder="设备类型"
+            class="short-input"
+            filterable
+            clearable
+          >
+            <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
           <dept-select
             v-model="listQuery.deptId"
             :data="useDeptList"

diff --git a/src/api/laboratory/data.ts b/src/api/laboratory/data.ts
index 8d8279b..3e64dd1 100644
--- a/src/api/laboratory/data.ts
+++ b/src/api/laboratory/data.ts
@@ -7,11 +7,20 @@
 
 // 列表查询
 export function getDataList(data: IListQuery, type: string) {
-  return request({
-    url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
+  if (type === 'ups/monitor') {
+    return request({
+      url: `${prefix}/${type}/list?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
+  else {
+    return request({
+      url: `${prefix}/${type}/listPage?offset=${data.offset}&limit=${data.limit}`,
+      method: 'post',
+      data,
+    })
+  }
 }
 
 // 导出
@@ -23,4 +32,3 @@
     responseType: 'blob',
   })
 }
-
diff --git a/src/assets/images/offLine.png b/src/assets/images/offLine.png
new file mode 100644
index 0000000..9abaf4d
--- /dev/null
+++ b/src/assets/images/offLine.png
Binary files differ
diff --git a/src/assets/images/onLine.png b/src/assets/images/onLine.png
new file mode 100644
index 0000000..38e430e
--- /dev/null
+++ b/src/assets/images/onLine.png
Binary files differ
diff --git a/src/assets/images/smoke-offLine.png b/src/assets/images/smoke-offLine.png
new file mode 100644
index 0000000..0eb4cd8
--- /dev/null
+++ b/src/assets/images/smoke-offLine.png
Binary files differ
diff --git a/src/assets/images/smoke.png b/src/assets/images/smoke.png
new file mode 100644
index 0000000..92b3412
--- /dev/null
+++ b/src/assets/images/smoke.png
Binary files differ
diff --git a/src/router/index.ts b/src/router/index.ts
index d244fb7..ae9b394 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -56,6 +56,7 @@
         if (to.name === 'login') {
           next({
             name: 'index',
+            // query: to.query,
             replace: true,
           })
         }
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 99c815c..bb2e8c3 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -48,7 +48,9 @@
     window.open(system.url + params)
   }
   else {
+    console.log(' ========synstem', system.name, system.code)
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
+
     routeStore.generateRoutesAtBack({ name: system.name, code: system.code }).then((res) => {
       if (menuStore.sidebarMenus.length > 0) {
         router.replace({ path: menuStore.sidebarMenusFirstDeepestPath })
diff --git a/src/views/laboratory/data/list-interface.ts b/src/views/laboratory/data/list-interface.ts
index fde23c3..9ed8845 100644
--- a/src/views/laboratory/data/list-interface.ts
+++ b/src/views/laboratory/data/list-interface.ts
@@ -87,6 +87,7 @@
   uploadTime: string //	上传时间
   userId: string //	负责人id
   userName: string //	负责人
+  status?: number | string // ups监测状态
 }
 
 // 列表请求参数
diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue
index 386b755..8db5f6e 100644
--- a/src/views/laboratory/data/list.vue
+++ b/src/views/laboratory/data/list.vue
@@ -27,7 +27,8 @@
   electricQuantityList: ref<IElectricQuantityList[]>([]), // 智能电量仪
   oxygenList: ref<IOxygenList[]>([]), // 氧气传感器
   smokeList: ref<ISmokeList[]>([]), // 烟雾传感器
-  upsList: ref<IUPSList[]>([]), // 烟雾传感器
+  upsList: ref<IUPSList[]>([]), // UPS电源间电池
+  upsMonitorList: ref<IUPSList[]>([]), // UPS监测
 }
 const menu = ref([ // 菜单
   {
@@ -101,18 +102,38 @@
   },
   {
     id: 'ups',
-    name: 'UPS电源',
+    name: 'UPS电源间电池',
     columns: ref<TableColumn[]>([
       { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
       { text: '设备名称', value: 'deviceName', align: 'center' },
       { 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: 'deviceStatusName', align: 'center', styleFilter: (row: IUPSList) => { return `${row.deviceStatus}` === '0' ? 'color: red' : `${row.deviceStatus}` === '1' ? 'color: #00a846' : '' } },
       { text: '上传时间', value: 'uploadTime', align: 'center', width: '180' },
     ]),
     list: listMap.upsList,
   },
+  {
+    id: 'ups/monitor',
+    name: 'UPS监测',
+    columns: ref<TableColumn[]>([
+      { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
+      { text: '设备名称', value: 'deviceName', align: 'center' },
+      { text: '负责部门', value: 'deptName', align: 'center' },
+      { text: '负责人', value: 'userName', align: 'center' },
+      { text: '安装地点', value: 'locationName', align: 'center' },
+      { text: '所属实验室', value: 'labName', align: 'center' },
+      { 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' },
+    ]),
+    list: listMap.upsMonitorList,
+  },
 ])
 const currentMenu = ref('temperatureHumidity') // 当前选中的菜单
 const currentIndex = ref(0) // 当前选中的菜单索引
@@ -185,10 +206,13 @@
     listQuery.value.offset = 1
   }
   getDataList(listQuery.value, currentMenu.value).then((response) => {
-    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string }) => {
+    menu.value[currentIndex.value].list = response.data.rows.map((item: { deviceStatus: string; status: string }) => {
       return {
         ...item,
         deviceStatusName: `${item.deviceStatus}` === '1' ? '在线' : `${item.deviceStatus}` === '0' ? '离线' : '未知',
+        upsMonitorDeviceStatusName: `${item.status}` === '0' ? '正常' : `${item.status}` === '1' ? '异常' : '未知',
+        params: '电池电压、电池电流...',
+        labName: listQuery.value.labName, // 所属实验室
       }
     })
     total.value = parseInt(response.data.total)
@@ -308,6 +332,37 @@
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </search-item>
+      <search-item v-if="currentMenu === 'ups' || currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.labName"
+          placeholder="所属实验室"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in ['西昌实验室', '海口实验室']" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="电压" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="内阻" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups'">
+        <el-input v-model.trim="listQuery.deviceNo" placeholder="温度" class="short-input" clearable />
+      </search-item>
+      <search-item v-if="currentMenu === 'ups/monitor'">
+        <el-select
+          v-model="listQuery.status"
+          placeholder="状态"
+          class="short-input"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in [{ name: '正常', value: '1' }, { name: '异常', value: '2' }]" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <search-item>
         <el-date-picker
           v-model="dateRange"
diff --git a/src/views/laboratory/equipment/list/detail.vue b/src/views/laboratory/equipment/list/detail.vue
index 350516c..c2baf39 100644
--- a/src/views/laboratory/equipment/list/detail.vue
+++ b/src/views/laboratory/equipment/list/detail.vue
@@ -58,7 +58,7 @@
 
 // 获取字典值
 async function getDict() {
-// 设备类型
+  // 设备类型
   getDictByCode('deviceType').then((response) => {
     typeList.value = response.data
   })
diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue
index a15545a..5f067db 100644
--- a/src/views/laboratory/equipment/list/list.vue
+++ b/src/views/laboratory/equipment/list/list.vue
@@ -23,6 +23,7 @@
   deviceName: '', // 设备名称
   deviceNo: '', // 设备编号
   deviceStatus: '', // 在线状态（1在线0离线）
+  deviceType: '', // 设备类型
   userId: '', // 负责人id（西昌组织下人员下拉选择）
   labName: user.lab, // 所属实验室
   ids: [],
@@ -33,6 +34,7 @@
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' },
   { text: '设备名称', value: 'deviceName', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '安装地点', value: 'locationName', align: 'center' },
   { text: '地点位置', value: 'locationPosition', align: 'center' },
   { text: '所属实验室', value: 'locationLab', align: 'center' },
@@ -49,6 +51,7 @@
 const useDeptList = ref<deptType[]>([]) // 所属部门列表
 const userList = ref<{ [key: string]: string }[]>([]) // 用户列表
 const deviceStatusList = ref([]) as any // 在线状态
+const deviceTypeList = ref([]) as any // 设备类型
 const deviceStatusMap = ref({}) as any // 在线状态
 
 const deptPid = ref('')
@@ -63,6 +66,10 @@
 
   //   // deptPid.value = '0'
   // })
+  // 设备类型
+  getDictByCode('deviceType').then((response) => {
+    deviceTypeList.value = response.data
+  })
   // 获取用户列表
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
     userList.value = res.data.rows
@@ -108,6 +115,7 @@
     deptId: '', // 负责部门id（西昌组织下拉选择）
     deviceName: '', // 设备名称
     deviceNo: '', // 设备编号
+    deviceType: '', // 设备类型
     deviceStatus: '', // 在线状态（1在线0离线）
     userId: '', // 负责人id（西昌组织下人员下拉选择）
     labName: user.lab, // 所属实验室
@@ -224,6 +232,7 @@
       deviceStatus: listQuery.value.deviceStatus, // 在线状态（1在线0离线）
       userId: listQuery.value.userId, // 负责人id（西昌组织下人员下拉选择）
       labName: listQuery.value.labName, // 所属实验室
+      deviceType: listQuery.value.deviceType, // 设备类型
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -268,6 +277,17 @@
           <el-input v-model.trim="listQuery.deviceName" placeholder="设备名称" class="short-input" clearable />
         </search-item>
         <search-item>
+          <el-select
+            v-model="listQuery.deviceType"
+            placeholder="设备类型"
+            class="short-input"
+            filterable
+            clearable
+          >
+            <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
           <dept-select
             v-model="listQuery.deptId"
             :data="useDeptList"
diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index 6f6c87f..4fcfbf4 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -179,68 +179,89 @@
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const electromagnetism2RoomHK = ref({ // 电磁学工作间2
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const qualityArbitrationRoomHK = ref({ // 质量检定工作间
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const pressure1RoomHK = ref({ // 压力检定工作间1
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const pressure2RoomHK = ref({ // 压力检定工作间2
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
-})
-
-const electromagneticShieldingRoomHK = ref({ // 电磁屏蔽间
-  temperature: '-', // 温度
-  humidity: '-', // 湿度
-  voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const microwaveSignal1RoomHK = ref({ // 微波信号检定工作间1
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
+})
+
+const timeFrequency1RoomHK = ref({ // 时间频率检定工作间1
+  temperature: '-', // 温度
+  humidity: '-', // 湿度
+  voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const timeFrequency2RoomHK = ref({ // 时间频率检定工作间2
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const electromagnetism1RoomHK = ref({ // 电磁学工作间1
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const FileRoomHK = ref({ // 档案间
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const safetyValveRoomHK = ref({ // 安全阀校验
-  fanOxygen: '', // 风扇氧气
-  wallOxygen: '', // 挂墙氧气
+  // fanOxygen: '', // 风扇氧气
+  // wallOxygen: '', // 挂墙氧气
   temperature: '-', // 温度
   humidity: '-', // 湿度
-  VOC: '-', // VOC
+  // VOC: '-', // VOC
+  oxygenDensity: '-', // 氧气
 })
 
 const receiveDispatchRoomHK = ref({ // 仪器收发间
@@ -258,17 +279,23 @@
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
 })
 
 const temperatureRoomHK = ref({ // 温度检定工作间
   temperature: '-', // 温度
   humidity: '-', // 湿度
   voltage: '-', // 电压
+  netWork: false, // 是否联网
+  airConditioner: '', // 精密空调状态
+  smokeStatus: '', // 烟感
 })
 
 // 获取图里的资源
 const fetchLocationDetail = () => {
   getLocationDetail(user.lab).then((res) => {
+    // =====================西昌==========================
     // 时间频率
     const timeFrequencyRoomIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '西昌时间频率计量工作间')
     if (timeFrequencyRoomIndex !== -1) {
@@ -362,6 +389,151 @@
       electricalMetrologyRoom.value.humidity = `${res.data[electricalMetrologyRoomIndex].humidity}` ? `${res.data[electricalMetrologyRoomIndex].humidity}` : '-'
       electricalMetrologyRoom.value.voltage = `${res.data[electricalMetrologyRoomIndex].voltage}` ? `${res.data[electricalMetrologyRoomIndex].voltage}` : '-'
     }
+
+    // ============================海口======================
+    // 海口温度检定工作间
+    const temperatureRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口温度检定工作间')
+    if (receiveDispatchRoomIndex !== -1) {
+      temperatureRoomHK.value.temperature = `${res.data[temperatureRoomHKIndex].temperature}` ? `${res.data[temperatureRoomHKIndex].temperature}` : '-'
+      temperatureRoomHK.value.humidity = `${res.data[temperatureRoomHKIndex].humidity}` ? `${res.data[temperatureRoomHKIndex].humidity}` : '-'
+      temperatureRoomHK.value.voltage = `${res.data[temperatureRoomHKIndex].voltage}` ? `${res.data[temperatureRoomHKIndex].voltage}` : '-'
+      temperatureRoomHK.value.netWork = res.data[temperatureRoomHKIndex].airStatus === '关机' || res.data[temperatureRoomHKIndex].airStatus === '开机'
+      temperatureRoomHK.value.airConditioner = res.data[temperatureRoomHKIndex].airStatus
+      temperatureRoomHK.value.smokeStatus = res.data[temperatureRoomHKIndex].smokeStatus
+    }
+
+    // 海口湿度检定工作间
+    const humidityRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口湿度检定工作间')
+    if (receiveDispatchRoomIndex !== -1) {
+      humidityRoomHK.value.temperature = `${res.data[humidityRoomHKIndex].temperature}` ? `${res.data[humidityRoomHKIndex].temperature}` : '-'
+      humidityRoomHK.value.humidity = `${res.data[humidityRoomHKIndex].humidity}` ? `${res.data[humidityRoomHKIndex].humidity}` : '-'
+      humidityRoomHK.value.voltage = `${res.data[humidityRoomHKIndex].voltage}` ? `${res.data[humidityRoomHKIndex].voltage}` : '-'
+      humidityRoomHK.value.netWork = res.data[humidityRoomHKIndex].airStatus === '关机' || res.data[humidityRoomHKIndex].airStatus === '开机'
+      humidityRoomHK.value.airConditioner = res.data[humidityRoomHKIndex].airStatus
+    }
+
+    // 海口UPS电源间
+    const UPSRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口UPS电源间')
+    if (receiveDispatchRoomIndex !== -1) {
+      UPSRoomHK.value.temperature = `${res.data[UPSRoomHKIndex].temperature}` ? `${res.data[UPSRoomHKIndex].temperature}` : '-'
+      UPSRoomHK.value.humidity = `${res.data[UPSRoomHKIndex].humidity}` ? `${res.data[UPSRoomHKIndex].humidity}` : '-'
+    }
+
+    // 海口档案间
+    const FileRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口档案间')
+    if (receiveDispatchRoomIndex !== -1) {
+      FileRoomHK.value.temperature = `${res.data[FileRoomHKIndex].temperature}` ? `${res.data[FileRoomHKIndex].temperature}` : '-'
+      FileRoomHK.value.humidity = `${res.data[FileRoomHKIndex].humidity}` ? `${res.data[FileRoomHKIndex].humidity}` : '-'
+      FileRoomHK.value.voltage = `${res.data[FileRoomHKIndex].voltage}` ? `${res.data[FileRoomHKIndex].voltage}` : '-'
+      FileRoomHK.value.netWork = res.data[FileRoomHKIndex].airStatus === '关机' || res.data[FileRoomHKIndex].airStatus === '开机'
+      FileRoomHK.value.airConditioner = res.data[FileRoomHKIndex].airStatus
+    }
+
+    // 海口电磁学工作间1
+    const electromagnetism1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口电磁学工作间1')
+    if (receiveDispatchRoomIndex !== -1) {
+      electromagnetism1RoomHK.value.temperature = `${res.data[electromagnetism1RoomHKIndex].temperature}` ? `${res.data[electromagnetism1RoomHKIndex].temperature}` : '-'
+      electromagnetism1RoomHK.value.humidity = `${res.data[electromagnetism1RoomHKIndex].humidity}` ? `${res.data[electromagnetism1RoomHKIndex].humidity}` : '-'
+      electromagnetism1RoomHK.value.voltage = `${res.data[electromagnetism1RoomHKIndex].voltage}` ? `${res.data[electromagnetism1RoomHKIndex].voltage}` : '-'
+      electromagnetism1RoomHK.value.netWork = res.data[electromagnetism1RoomHKIndex].airStatus === '关机' || res.data[electromagnetism1RoomHKIndex].airStatus === '开机'
+      electromagnetism1RoomHK.value.airConditioner = res.data[electromagnetism1RoomHKIndex].airStatus
+    }
+
+    // 海口时间频率检定工作间1
+    const timeFrequency1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口时间频率检定工作间1')
+    if (receiveDispatchRoomIndex !== -1) {
+      timeFrequency1RoomHK.value.temperature = `${res.data[timeFrequency1RoomHKIndex].temperature}` ? `${res.data[timeFrequency1RoomHKIndex].temperature}` : '-'
+      timeFrequency1RoomHK.value.humidity = `${res.data[timeFrequency1RoomHKIndex].humidity}` ? `${res.data[timeFrequency1RoomHKIndex].humidity}` : '-'
+      timeFrequency1RoomHK.value.voltage = `${res.data[timeFrequency1RoomHKIndex].voltage}` ? `${res.data[timeFrequency1RoomHKIndex].voltage}` : '-'
+      timeFrequency1RoomHK.value.netWork = res.data[timeFrequency1RoomHKIndex].airStatus === '关机' || res.data[timeFrequency1RoomHKIndex].airStatus === '开机'
+      timeFrequency1RoomHK.value.airConditioner = res.data[timeFrequency1RoomHKIndex].airStatus
+    }
+
+    // 海口时间频率检定工作间2
+    const timeFrequency2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口时间频率检定工作间2')
+    if (receiveDispatchRoomIndex !== -1) {
+      timeFrequency2RoomHK.value.temperature = `${res.data[timeFrequency2RoomHKIndex].temperature}` ? `${res.data[timeFrequency2RoomHKIndex].temperature}` : '-'
+      timeFrequency2RoomHK.value.humidity = `${res.data[timeFrequency2RoomHKIndex].humidity}` ? `${res.data[timeFrequency2RoomHKIndex].humidity}` : '-'
+      timeFrequency2RoomHK.value.voltage = `${res.data[timeFrequency2RoomHKIndex].voltage}` ? `${res.data[timeFrequency2RoomHKIndex].voltage}` : '-'
+      timeFrequency2RoomHK.value.netWork = res.data[timeFrequency2RoomHKIndex].airStatus === '关机' || res.data[timeFrequency2RoomHKIndex].airStatus === '开机'
+      timeFrequency2RoomHK.value.airConditioner = res.data[timeFrequency2RoomHKIndex].airStatus
+    }
+
+    // 海口微波信号检定工作间1
+    const microwaveSignal1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口微波信号检定工作间1')
+    if (receiveDispatchRoomIndex !== -1) {
+      microwaveSignal1RoomHK.value.temperature = `${res.data[microwaveSignal1RoomHKIndex].temperature}` ? `${res.data[microwaveSignal1RoomHKIndex].temperature}` : '-'
+      microwaveSignal1RoomHK.value.humidity = `${res.data[microwaveSignal1RoomHKIndex].humidity}` ? `${res.data[microwaveSignal1RoomHKIndex].humidity}` : '-'
+      microwaveSignal1RoomHK.value.voltage = `${res.data[microwaveSignal1RoomHKIndex].voltage}` ? `${res.data[microwaveSignal1RoomHKIndex].voltage}` : '-'
+      microwaveSignal1RoomHK.value.netWork = res.data[microwaveSignal1RoomHKIndex].airStatus === '关机' || res.data[microwaveSignal1RoomHKIndex].airStatus === '开机'
+      microwaveSignal1RoomHK.value.airConditioner = res.data[microwaveSignal1RoomHKIndex].airStatus
+    }
+
+    // 海口仪器收发间
+    const receiveDispatchRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口仪器收发间')
+    if (receiveDispatchRoomIndex !== -1) {
+      receiveDispatchRoomHK.value.temperature = `${res.data[receiveDispatchRoomHKIndex].temperature}` ? `${res.data[receiveDispatchRoomHKIndex].temperature}` : '-'
+      receiveDispatchRoomHK.value.humidity = `${res.data[receiveDispatchRoomHKIndex].humidity}` ? `${res.data[receiveDispatchRoomHKIndex].humidity}` : '-'
+      receiveDispatchRoomHK.value.oxygenDensity = `${res.data[receiveDispatchRoomHKIndex].voltage}` ? `${res.data[receiveDispatchRoomHKIndex].oxygenDensity}` : '-'
+    }
+
+    // 海口安全阀校验间
+    const safetyValveRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口安全阀校验间')
+    if (receiveDispatchRoomIndex !== -1) {
+      safetyValveRoomHK.value.temperature = `${res.data[safetyValveRoomHKIndex].temperature}` ? `${res.data[safetyValveRoomHKIndex].temperature}` : '-'
+      safetyValveRoomHK.value.humidity = `${res.data[safetyValveRoomHKIndex].humidity}` ? `${res.data[safetyValveRoomHKIndex].humidity}` : '-'
+      safetyValveRoomHK.value.oxygenDensity = `${res.data[safetyValveRoomHKIndex].voltage}` ? `${res.data[safetyValveRoomHKIndex].oxygenDensity}` : '-'
+    }
+
+    // 海口压力检定工作间2
+    const pressure2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口压力检定工作间2')
+    if (receiveDispatchRoomIndex !== -1) {
+      pressure2RoomHK.value.temperature = `${res.data[pressure2RoomHKIndex].temperature}` ? `${res.data[pressure2RoomHKIndex].temperature}` : '-'
+      pressure2RoomHK.value.humidity = `${res.data[pressure2RoomHKIndex].humidity}` ? `${res.data[pressure2RoomHKIndex].humidity}` : '-'
+      pressure2RoomHK.value.voltage = `${res.data[pressure2RoomHKIndex].voltage}` ? `${res.data[pressure2RoomHKIndex].voltage}` : '-'
+      pressure2RoomHK.value.netWork = res.data[pressure2RoomHKIndex].airStatus === '关机' || res.data[pressure2RoomHKIndex].airStatus === '开机'
+      pressure2RoomHK.value.airConditioner = res.data[pressure2RoomHKIndex].airStatus
+    }
+
+    // 海口压力检定工作间1
+    const pressure1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口压力检定工作间1')
+    if (receiveDispatchRoomIndex !== -1) {
+      pressure1RoomHK.value.temperature = `${res.data[pressure1RoomHKIndex].temperature}` ? `${res.data[pressure1RoomHKIndex].temperature}` : '-'
+      pressure1RoomHK.value.humidity = `${res.data[pressure1RoomHKIndex].humidity}` ? `${res.data[pressure1RoomHKIndex].humidity}` : '-'
+      pressure1RoomHK.value.voltage = `${res.data[pressure1RoomHKIndex].voltage}` ? `${res.data[pressure1RoomHKIndex].voltage}` : '-'
+      pressure1RoomHK.value.netWork = res.data[pressure1RoomHKIndex].airStatus === '关机' || res.data[pressure1RoomHKIndex].airStatus === '开机'
+      pressure1RoomHK.value.airConditioner = res.data[pressure1RoomHKIndex].airStatus
+    }
+
+    // 海口电磁学工作间2
+    const electromagnetism2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口电磁学工作间2')
+    if (receiveDispatchRoomIndex !== -1) {
+      electromagnetism2RoomHK.value.temperature = `${res.data[electromagnetism2RoomHKIndex].temperature}` ? `${res.data[electromagnetism2RoomHKIndex].temperature}` : '-'
+      electromagnetism2RoomHK.value.humidity = `${res.data[electromagnetism2RoomHKIndex].humidity}` ? `${res.data[electromagnetism2RoomHKIndex].humidity}` : '-'
+      electromagnetism2RoomHK.value.voltage = `${res.data[electromagnetism2RoomHKIndex].voltage}` ? `${res.data[electromagnetism2RoomHKIndex].voltage}` : '-'
+      electromagnetism2RoomHK.value.netWork = res.data[electromagnetism2RoomHKIndex].airStatus === '关机' || res.data[electromagnetism2RoomHKIndex].airStatus === '开机'
+      electromagnetism2RoomHK.value.airConditioner = res.data[electromagnetism2RoomHKIndex].airStatus
+    }
+
+    // 海口质量检定工作间
+    const qualityArbitrationRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口质量检定工作间')
+    if (receiveDispatchRoomIndex !== -1) {
+      qualityArbitrationRoomHK.value.temperature = `${res.data[qualityArbitrationRoomHKIndex].temperature}` ? `${res.data[qualityArbitrationRoomHKIndex].temperature}` : '-'
+      qualityArbitrationRoomHK.value.humidity = `${res.data[qualityArbitrationRoomHKIndex].humidity}` ? `${res.data[qualityArbitrationRoomHKIndex].humidity}` : '-'
+      qualityArbitrationRoomHK.value.voltage = `${res.data[qualityArbitrationRoomHKIndex].voltage}` ? `${res.data[qualityArbitrationRoomHKIndex].voltage}` : '-'
+      qualityArbitrationRoomHK.value.netWork = res.data[qualityArbitrationRoomHKIndex].airStatus === '关机' || res.data[qualityArbitrationRoomHKIndex].airStatus === '开机'
+      qualityArbitrationRoomHK.value.airConditioner = res.data[qualityArbitrationRoomHKIndex].airStatus
+    }
+
+    // 海口备品备件库
+    const spareRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口备品备件库')
+    if (receiveDispatchRoomIndex !== -1) {
+      spareRoomHK.value.temperature = `${res.data[spareRoomHKIndex].temperature}` ? `${res.data[spareRoomHKIndex].temperature}` : '-'
+      spareRoomHK.value.humidity = `${res.data[spareRoomHKIndex].humidity}` ? `${res.data[spareRoomHKIndex].humidity}` : '-'
+      spareRoomHK.value.voltage = `${res.data[spareRoomHKIndex].voltage}` ? `${res.data[spareRoomHKIndex].voltage}` : '-'
+      spareRoomHK.value.netWork = res.data[spareRoomHKIndex].airStatus === '关机' || res.data[spareRoomHKIndex].airStatus === '开机'
+      spareRoomHK.value.airConditioner = res.data[spareRoomHKIndex].airStatus
+    }
   })
 }
 
@@ -406,9 +578,97 @@
   </div>
 
   <div style="width: 100%; box-sizing: border-box;position: relative;">
-    <div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
-      <img v-show="user.lab === '西昌实验室' || (user.lab === '' && selectLab === '西昌实验室')" src="../../../assets/images/lab.png" style="width: 100%;margin-top: -50px;margin-left: -10px;">
-      <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室')" src="../../../assets/images/hk.png" style="width: 960px;height: 540px;">
+    <div style="display: flex;justify-content: center;margin-top: 10px;">
+      <div style="width: fit-content;height: fit-content;position: relative;">
+        <img v-show="user.lab === '西昌实验室' || (user.lab === '' && selectLab === '西昌实验室')" src="../../../assets/images/lab.png" style="width: 100%;margin-top: -50px;margin-left: -10px;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室')" src="../../../assets/images/hk.png" style="width: 960px;height: 540px;">
+
+        <!-- 备品备件库是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && spareRoomHK.airConditioner !== ''" :class="spareRoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 26%;left: 12%;">
+          {{ spareRoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && spareRoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 12%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !spareRoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 12%;">
+
+        <!-- 电磁学工作间2是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && electromagnetism2RoomHK.airConditioner !== ''" :class="electromagnetism2RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 26%;left: 22%;">
+          {{ electromagnetism2RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && electromagnetism2RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 22%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !electromagnetism2RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 22%;">
+
+        <!-- 质量检定工作间是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && qualityArbitrationRoomHK.airConditioner !== ''" :class="qualityArbitrationRoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 26%;left: 32%;">
+          {{ qualityArbitrationRoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && qualityArbitrationRoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 32%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !qualityArbitrationRoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 32%;">
+
+        <!-- 压力检定工作间1是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && pressure1RoomHK.airConditioner !== ''" :class="pressure1RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 26%;left: 42%;">
+          {{ pressure1RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && pressure1RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 42%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !pressure1RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 42%;">
+
+        <!-- 压力检定工作间2是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && pressure2RoomHK.airConditioner !== ''" :class="pressure2RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 26%;left: 52%;">
+          {{ pressure2RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && pressure2RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 52%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !pressure2RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 30%;left: 52%;">
+
+        <!-- 时间频率检定工作间1是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && timeFrequency1RoomHK.airConditioner !== ''" :class="timeFrequency1RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 11.5%;">
+          {{ timeFrequency1RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && timeFrequency1RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 12%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !timeFrequency1RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 12%;">
+
+        <!-- 微波信号检定工作间1是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && microwaveSignal1RoomHK.airConditioner !== ''" :class="microwaveSignal1RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 21.5%;">
+          {{ microwaveSignal1RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && microwaveSignal1RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 22%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !microwaveSignal1RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 22%;">
+
+        <!-- 时间频率检定工作间2是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && timeFrequency2RoomHK.airConditioner !== ''" :class="timeFrequency2RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 31.5%;">
+          {{ timeFrequency2RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && timeFrequency2RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 32%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !timeFrequency2RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 32%;">
+
+        <!-- 电磁学工作间1是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && electromagnetism1RoomHK.airConditioner !== ''" :class="electromagnetism1RoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 41.5%;">
+          {{ electromagnetism1RoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && electromagnetism1RoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 42%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !electromagnetism1RoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 42%;">
+
+        <!-- 档案间是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && FileRoomHK.airConditioner !== ''" :class="FileRoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 52%;">
+          {{ FileRoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && FileRoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 52%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !FileRoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 52%;">
+
+        <!-- 温度检定工作间是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && temperatureRoomHK.airConditioner !== ''" :class="temperatureRoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 84%;">
+          {{ temperatureRoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && temperatureRoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 84%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !temperatureRoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 84%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && temperatureRoomHK.smokeStatus === '断开'" src="../../../assets/images/smoke.png" style="width: 40px;height: 40px;position: absolute;top: 42%;left: 90%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && temperatureRoomHK.smokeStatus === '报警'" src="../../../assets/images/smoke-offLine.png" style="width: 40px;height: 40px;position: absolute;top: 42%;left: 90%;">
+
+        <!-- 湿度检定工作间是否联网、空调状态 -->
+        <div v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && humidityRoomHK.airConditioner !== ''" :class="humidityRoomHK.airConditioner === '关机' ? 'airConditioner' : 'airConditioner-on'" style="position: absolute;top: 46.5%;left: 77%;">
+          {{ humidityRoomHK.airConditioner }}
+        </div>
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && humidityRoomHK.netWork" src="../../../assets/images/onLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 77%;">
+        <img v-show="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室') && !humidityRoomHK.netWork" src="../../../assets/images/offLine.png" style="width: 40px;height: 40px;position: absolute;top: 40%;left: 77%;">
+      </div>
     </div>
     <!-- ===================================西昌======================================= -->
     <!-- 温湿度计量工作间（内） -->
@@ -643,7 +903,7 @@
     />
 
     <!-- 电磁屏蔽间 -->
-    <monitor-data
+    <!-- <monitor-data
       v-if="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室')"
       title="电磁屏蔽间"
       top="70%"
@@ -652,7 +912,7 @@
       :humidity="electromagneticShieldingRoomHK.humidity"
       :voltage="electromagneticShieldingRoomHK.voltage"
       background="rgba(165, 116, 202, 0.7)"
-    />
+    /> -->
 
     <!-- 微波信号检定工作间1 -->
     <monitor-data
@@ -666,6 +926,18 @@
       background="rgba(220, 54, 46, 0.7)"
     />
 
+    <!-- 时间频率检定工作间1 -->
+    <monitor-data
+      v-if="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室')"
+      title="时间频率检定工作间1"
+      top="70%"
+      left="10%"
+      :temperature="timeFrequency1RoomHK.temperature"
+      :humidity="timeFrequency1RoomHK.humidity"
+      :voltage="timeFrequency1RoomHK.voltage"
+      background="rgba(165, 116, 202, 0.7)"
+    />
+
     <!-- 时间频率检定工作间2 -->
     <monitor-data
       v-if="user.lab === '海口实验室' || (user.lab === '' && selectLab === '海口实验室')"
@@ -788,3 +1060,23 @@
   </div>
 </template>
 
+<style lang="scss">
+.airConditioner {
+  padding: 2px 10px;
+  border-radius: 6px;
+  background-color: #e94242;
+  font-size: 12px;
+  font-weight: 600;
+  color: #fff;
+}
+
+.airConditioner-on {
+  padding: 2px 10px;
+  border-radius: 6px;
+  background-color: #1aa034;
+  font-size: 12px;
+  font-weight: 600;
+  color: #fff;
+}
+</style>
+