Ver Fonte

feat: 通过小区列表查看设备,允许查看指定小区的设备;

liujia há 1 semana atrás
pai
commit
f8b72fb
2 ficheiros alterados com 6 adições e 2 exclusões
  1. 1 1
      src/api/device/types.ts
  2. 5 1
      src/views/device/list/index.vue

+ 1 - 1
src/api/device/types.ts

@@ -85,7 +85,7 @@ export interface DeviceListParams {
   online?: number | null // 设备状态:0-离线,1-在线
   createTimeStart?: string // 起始时间 格式yyyy-MM-dd
   createTimeEnd?: string // 结束时间 格式yyyy-MM-dd
-  tenantId?: string | null // 租户ID
+  tenantId?: string | null | undefined // 租户ID
 }
 
 /**

+ 5 - 1
src/views/device/list/index.vue

@@ -174,13 +174,14 @@ import addDeviceModal from './components/addDevice/index.vue'
 import uploadDeviceModal from './components/uploadDevice/index.vue'
 import OTADeviceModal from './components/OTADevice/index.vue'
 import { useSearch } from '@/hooks/useSearch'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import * as tenantAPI from '@/api/tenant'
 import type { TenantItem } from '@/api/tenant/types'
 import * as adminAPI from '@/api/admin'
 import * as deviceApi from '@/api/device'
 
 const router = useRouter()
+const route = useRoute()
 
 interface SearchData {
   deviceId: string // 设备ID
@@ -236,6 +237,7 @@ const fetchList = async () => {
       createTimeStart: searchState.createTimeStart,
       createTimeEnd: searchState.createTimeEnd,
       online: searchState.deviceStatus,
+      tenantId: (route.query.tenantId as string) ?? undefined,
     })
     const allDeviceRes = await deviceAPI.getDeviceList({
       pageNo: current.value,
@@ -245,6 +247,7 @@ const fetchList = async () => {
       createTimeStart: searchState.createTimeStart,
       createTimeEnd: searchState.createTimeEnd,
       online: null,
+      tenantId: (route.query.tenantId as string) ?? undefined,
     })
     const onlineDeviceRes = await deviceAPI.getDeviceList({
       pageNo: current.value,
@@ -254,6 +257,7 @@ const fetchList = async () => {
       createTimeStart: searchState.createTimeStart,
       createTimeEnd: searchState.createTimeEnd,
       online: 1,
+      tenantId: (route.query.tenantId as string) ?? undefined,
     })
     allDeviceTotal.value = Number(allDeviceRes.data.total) || 0 // 所有设备数量
     onlineDeviceTotal.value = Number(onlineDeviceRes.data.total) || 0 // 在线设备数量