更改家床设备接口文件

src/api/living-home/home-device/index.ts

@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+/** 原 Vue 大屏直连 /api/pc/admin，统一走项目 axios（与 admin-api 基址拼接） */
+const PC_ADMIN = '/api/pc/admin'
+
+// —— POST ——
+
+export const deviceScreenBindDevice = (data: Record<string, any>) => {
+  return request.post({ url: `${PC_ADMIN}/bindDevice`, data })
+}
+
+export const deviceScreenUnbindDevice = (data: Record<string, any>) => {
+  return request.post({ url: `${PC_ADMIN}/unbindDevice`, data })
+}
+
+export const deviceScreenAddElder = (data: Record<string, any>) => {
+  return request.post({ url: `${PC_ADMIN}/addElder`, data })
+}
+
+export const deviceScreenProcessAlert = (data: Record<string, any>) => {
+  return request.post({ url: `${PC_ADMIN}/processAlert`, data })
+}
+
+export const deviceScreenDealWith = (data: Record<string, any>) => {
+  return request.post({ url: `${PC_ADMIN}/dealWith`, data })
+}
+
+// —— GET ——
+
+export const deviceScreenGetStatistics = (params: { organizationId: string | number }) => {
+  return request.get({ url: `${PC_ADMIN}/getStatistics`, params })
+}
+
+export const deviceScreenGetElderList = (params: { organizationId: string | number }) => {
+  return request.get({ url: `${PC_ADMIN}/getElderList`, params })
+}
+
+export const deviceScreenGetDeviceDetail = (params: { deviceCode: string }) => {
+  return request.get({ url: `${PC_ADMIN}/getDeviceDetail`, params })
+}
+
+export const deviceScreenGetElderHealthAndDeviceInfo = (params: { elderId: number }) => {
+  return request.get({ url: `${PC_ADMIN}/getElderHealthAndDeviceInfo`, params })
+}
+
+export const deviceScreenGetAllWarning = (params: { pageNum: number; pageSize: number }) => {
+  return request.get({ url: `${PC_ADMIN}/getAllWarning`, params })
+}
+
+export const deviceScreenGetAllDeviceTypes = () => {
+  return request.get({ url: `${PC_ADMIN}/getAllDeviceTypes` })
+}
+
+export const deviceScreenGetOrganizationDevices = () => {
+  return request.get({ url: `${PC_ADMIN}/getOrganizationDevices` })
+}
+
+export const deviceScreenGetElderHistoryLocations = (params: {
+  elderId?: number | string
+}) => {
+  return request.get({ url: `${PC_ADMIN}/getElderHistoryLocations`, params })
+}
+
+export const deviceScreenGetElderDetail = (params: { elderId: number }) => {
+  return request.get({ url: `${PC_ADMIN}/getElderDetail`, params })
+}
+
+export const deviceScreenGetElderAlerts = (params: {
+  elderId: number
+  pageNum: number
+  pageSize: number
+}) => {
+  return request.get({ url: `${PC_ADMIN}/getElderAlerts`, params })
+}

src/views/living-home/device-management/home-device/components/ElderLocationMap.vue

@@ -43,8 +43,7 @@
 import { ref, reactive, onMounted, onUnmounted, watch, nextTick } from 'vue'
 import { AMAP_CONFIG } from '@/config/amapConfig'
 import { Loading } from '@element-plus/icons-vue'
-import fetchHttp from '@/config/axios/fetchHttp'
-import { getAccessToken } from '@/utils/auth'
+import { deviceScreenGetElderHistoryLocations } from '@/api/living-home/home-device'
 import { amapReverseGeocode } from '@/utils/amapService'
 
 interface Props {
@@ -403,13 +402,7 @@ const fetchElderHistoryLocations = async () => {
   loading.value = true
   error.value = ''
   try {
-    const res = await fetchHttp.get(
-      '/api/pc/admin/getElderHistoryLocations',
-      { elderId: props.elderId },
-      {
-        headers: { Authorization: `Bearer ${getAccessToken()}` }
-      }
-    )
+    const res = await deviceScreenGetElderHistoryLocations({ elderId: props.elderId })
     const payload = res?.data ?? res
     const list = payload?.historyList ?? payload
     if (Array.isArray(list)) {

src/views/living-home/device-management/home-device/components/ElderProfileDialog.vue

@@ -96,8 +96,7 @@
 import { ref, computed, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Loading } from '@element-plus/icons-vue'
-import fetchHttp from '@/config/axios/fetchHttp'
-import { getAccessToken } from '@/utils/auth'
+import { deviceScreenGetElderDetail } from '@/api/living-home/home-device'
 import { formatToDateTime } from '@/utils/dateUtil'
 
 // 类型定义
@@ -180,15 +179,7 @@ const fetchElderDetail = async (elderId: number) => {
 
   loading.value = true
   try {
-    const res = await fetchHttp.get(
-      `/api/pc/admin/getElderDetail?elderId=${elderId}`,
-      {},
-      {
-        headers: {
-          Authorization: `Bearer ${getAccessToken()}`
-        }
-      }
-    )
+    const res = await deviceScreenGetElderDetail({ elderId })
 
     if (res) {
       elderData.value = res

src/views/living-home/device-management/home-device/components/ElderWarningServiceDialog.vue

@@ -60,8 +60,7 @@
 import { ref, computed, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Loading } from '@element-plus/icons-vue'
-import fetchHttp from '@/config/axios/fetchHttp'
-import { getAccessToken } from '@/utils/auth'
+import { deviceScreenGetElderAlerts } from '@/api/living-home/home-device'
 import { formatToDateTime } from '@/utils/dateUtil'
 
 // 类型定义
@@ -134,19 +133,11 @@ const fetchWarningServiceData = async (elderId: number) => {
 
   loading.value = true
   try {
-    const res = await fetchHttp.get(
-      '/api/pc/admin/getElderAlerts',
-      {
-        elderId: elderId,
-        pageNum: pageNum.value,
-        pageSize: pageSize.value
-      },
-      {
-        headers: {
-          Authorization: `Bearer ${getAccessToken()}`
-        }
-      }
-    )
+    const res = await deviceScreenGetElderAlerts({
+      elderId: elderId,
+      pageNum: pageNum.value,
+      pageSize: pageSize.value
+    })
 
     if (res && Array.isArray(res.list) && res.list.length > 0) {
       total.value = res.total || 0

src/views/living-home/device-management/home-device/home-refactored.vue

@@ -112,8 +112,20 @@
 <script lang="ts" setup>
 import { ref, computed, onMounted, onUnmounted, nextTick, h, defineAsyncComponent } from 'vue'
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
-import fetchHttp from '@/config/axios/fetchHttp'
-import { getAccessToken, getLoginForm } from '@/utils/auth'
+import { getLoginForm } from '@/utils/auth'
+import {
+  deviceScreenBindDevice,
+  deviceScreenUnbindDevice,
+  deviceScreenAddElder,
+  deviceScreenProcessAlert,
+  deviceScreenGetStatistics,
+  deviceScreenGetElderList,
+  deviceScreenGetDeviceDetail,
+  deviceScreenGetElderHealthAndDeviceInfo,
+  deviceScreenGetAllWarning,
+  deviceScreenGetAllDeviceTypes,
+  deviceScreenGetOrganizationDevices
+} from '@/api/living-home/home-device'
 import { useWebSocket } from './composables/useWebSocket'
 import { amapReverseGeocode } from '@/utils/amapService'
 
@@ -375,11 +387,7 @@ const openAddDeviceFromList = (elderly: Elderly) => {
 
 const addDevice = async (data: any) => {
   try {
-    const res = await fetchHttp.post('/api/pc/admin/bindDevice', data, {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    })
+    const res = await deviceScreenBindDevice(data)
     if (res) {
       ElMessage.success('设备添加成功！')
       getElderDeviceMessage(selectedElderly.value.id)
@@ -401,18 +409,10 @@ const removeDevice = (elderly: any, device: DetailDevice) => {
     type: 'warning'
   })
     .then(async () => {
-      const res = await fetchHttp.post(
-        '/api/pc/admin/unbindDevice',
-        {
-          deviceCode: device.deviceCode,
-          elderId: Number(elderly.id)
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${getAccessToken()}`
-          }
-        }
-      )
+      const res = await deviceScreenUnbindDevice({
+        deviceCode: device.deviceCode,
+        elderId: Number(elderly.id)
+      })
       if (res) {
         ElMessage.success('设备删除成功！')
         getElderDeviceMessage(selectedElderly.value.id)
@@ -439,11 +439,7 @@ const openElderWarningServiceDialog = (elderly: any) => {
 
 const submitAddElder = async (data: any) => {
   try {
-    const res = await fetchHttp.post('/api/pc/admin/addElder', data, {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    })
+    const res = await deviceScreenAddElder(data)
     if (res) {
       ElMessage.success('长者添加成功！')
       await getElderList()
@@ -469,11 +465,7 @@ const submitHandleWarning = async (data: any) => {
     remarks: data.message || ''
   }
   try {
-    const res = await fetchHttp.post('/api/pc/admin/processAlert', params, {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    })
+    const res = await deviceScreenProcessAlert(params)
     if (res) {
       ElMessage.success(data.handleType === 'report' ? '告警情况已上报！' : '电话回访已确认！')
       clearWarningFlag(data.elderId)
@@ -561,15 +553,7 @@ const onHandleWarningFromDrawer = (record: WarningHistory) => {
 
 // API 调用
 const getStatistics = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getStatistics?organizationId=' + organizationId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetStatistics({ organizationId })
   if (res.list && res.list.length) {
     res.list.forEach((v: any) => {
       const index = largeScreenStats.value.findIndex((z) => z.indicator == v.indicator)
@@ -583,15 +567,7 @@ const getStatistics = async () => {
 }
 
 const getElderList = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getElderList?organizationId=' + organizationId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetElderList({ organizationId })
   if (res?.length) {
     elderlyList.value = res
     if (elderlyList.value.length) {
@@ -604,30 +580,14 @@ const getElderList = async () => {
 }
 
 const getDeviceDetail = async (deviceCode: string) => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getDeviceDetail?deviceCode=' + deviceCode,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetDeviceDetail({ deviceCode })
   if (res) {
     deviceDetail.value = res
   }
 }
 
 const getElderDeviceMessage = async (elderId: number) => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getElderHealthAndDeviceInfo?elderId=' + elderId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetElderHealthAndDeviceInfo({ elderId })
   if (res) {
     selectedElderly.value.healthList = res.healthList
     selectedElderly.value.deviceList = res.deviceList
@@ -639,11 +599,7 @@ const getAllWarning = async () => {
     pageNum: pageNum.value,
     pageSize: pageSize.value
   }
-  const res = await fetchHttp.get('/api/pc/admin/getAllWarning', params, {
-    headers: {
-      Authorization: `Bearer ${getAccessToken()}`
-    }
-  })
+  const res = await deviceScreenGetAllWarning(params)
   if (res) {
     total.value = res.total
     warningData.value = res.list || []
@@ -651,15 +607,7 @@ const getAllWarning = async () => {
 }
 
 const getAllDevices = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getAllDeviceTypes',
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetAllDeviceTypes()
   if (res && res?.length) {
     deviceTypeOptions.value = res
   }
@@ -682,15 +630,7 @@ const handelDeviceRefresh = async () => {
 // 全部设备视图相关方法
 const refreshAllDevices = async () => {
   try {
-    const res = await fetchHttp.get(
-      '/api/pc/admin/getOrganizationDevices',
-      {},
-      {
-        headers: {
-          Authorization: `Bearer ${getAccessToken()}`
-        }
-      }
-    )
+    const res = await deviceScreenGetOrganizationDevices()
     console.log('res', res)
     if (res?.deviceList && Array.isArray(res.deviceList)) {
       allDevices.value = res.deviceList

src/views/living-home/device-management/home-device/home.vue

@@ -501,8 +501,19 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, onUnmounted, nextTick, h } from 'vue'
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
-import fetchHttp from '@/config/axios/fetchHttp'
 import { getAccessToken, getLoginForm } from '@/utils/auth'
+import {
+  deviceScreenBindDevice,
+  deviceScreenUnbindDevice,
+  deviceScreenAddElder,
+  deviceScreenDealWith,
+  deviceScreenGetStatistics,
+  deviceScreenGetElderList,
+  deviceScreenGetDeviceDetail,
+  deviceScreenGetElderHealthAndDeviceInfo,
+  deviceScreenGetAllWarning,
+  deviceScreenGetAllDeviceTypes
+} from '@/api/living-home/home-device'
 import { formatToDateTime } from '@/utils/dateUtil'
 
 interface WarningHistory {
@@ -742,7 +753,7 @@ const deviceStatusMap: Record<
   ['警告']: { text: '警告', class: 'warning', tagType: 'warning' }
 }
 
-const organizationId = localStorage.getItem('organizationId')
+const organizationId = localStorage.getItem('organizationId') || ''
 
 // 响应式数据
 const total = ref(0)
@@ -962,11 +973,7 @@ const submitAddElder = async () => {
       gender: addElderForm.gender
     }
     // 调用添加长者接口
-    const res = await fetchHttp.post('/api/pc/admin/addElder', elderData, {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    })
+    const res = await deviceScreenAddElder(elderData)
     if (res) {
       ElMessage.success('长者添加成功！')
       closeAddElderDialog()
@@ -1007,16 +1014,11 @@ const submitHandleWarning = async () => {
   // 如果是上报
   if (handleWarningForm.handleType === 'report') {
     try {
-      let apiUrl = '/api/pc/admin/dealWith'
       let requestData: any = {
         elderId: currentWarningElderly.value.id,
         message: handleWarningForm.message || ''
       }
-      const res = await fetchHttp.post(apiUrl, requestData, {
-        headers: {
-          Authorization: `Bearer ${getAccessToken()}`
-        }
-      })
+      const res = await deviceScreenDealWith(requestData)
       if (res) {
         ElMessage.success('告警情况已上报！')
         // 清除该老人的告警标记
@@ -1090,11 +1092,7 @@ const addDevice = async () => {
       organizationName: getTenantName(),
       elderlyName: addDeviceForm.elderlyName
     }
-    const res = await fetchHttp.post('/api/pc/admin/bindDevice', newDevice, {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    })
+    const res = await deviceScreenBindDevice(newDevice)
     if (res) {
       ElMessage.success('设备添加成功！')
       closeDialog()
@@ -1113,18 +1111,10 @@ const removeDevice = (elderly: any, device: DetailDevice) => {
     type: 'warning'
   })
     .then(async () => {
-      const res = await fetchHttp.post(
-        '/api/pc/admin/unbindDevice',
-        {
-          deviceCode: device.deviceCode,
-          elderId: Number(elderly.id)
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${getAccessToken()}`
-          }
-        }
-      )
+      const res = await deviceScreenUnbindDevice({
+        deviceCode: device.deviceCode,
+        elderId: Number(elderly.id)
+      })
       if (res) {
         ElMessage.success('设备删除成功！')
         getElderDeviceMessage(selectedElderly.value.id)
@@ -1228,15 +1218,7 @@ const updateDateTime = () => {
 
 // 获取统计数据
 const getStatistics = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getStatistics?organizationId=' + organizationId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetStatistics({ organizationId })
   if (res.list && res.list.length) {
     let resData = JSON.parse(JSON.stringify(res.list))
     resData.forEach((v: any) => {
@@ -1254,15 +1236,7 @@ const getStatistics = async () => {
 
 // 获取长者列表
 const getElderList = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getElderList?organizationId=' + organizationId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetElderList({ organizationId })
   if (res?.length) {
     elderlyList.value = res
     // 默认选择第一个老人
@@ -1277,15 +1251,7 @@ const getElderList = async () => {
 
 // 查询设备详情
 const getDeviceDetail = async (deviceCode: string) => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getDeviceDetail?deviceCode=' + deviceCode,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetDeviceDetail({ deviceCode })
   if (res) {
     deviceDetail.value = res
   }
@@ -1293,15 +1259,7 @@ const getDeviceDetail = async (deviceCode: string) => {
 
 // 查询设备详情
 const getElderDeviceMessage = async (elderId: number) => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getElderHealthAndDeviceInfo?elderId=' + elderId,
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetElderHealthAndDeviceInfo({ elderId })
   res
   if (res) {
     selectedElderly.value.healthList = res.healthList
@@ -1316,11 +1274,7 @@ const getAllWarning = async () => {
     pageNum: pageNum.value,
     pageSize: pageSize.value
   }
-  const res = await fetchHttp.get('/api/pc/admin/getAllWarning', params, {
-    headers: {
-      Authorization: `Bearer ${getAccessToken()}`
-    }
-  })
+  const res = await deviceScreenGetAllWarning(params)
   if (res) {
     total.value = res.total
     warningData.value = res.list || []
@@ -1340,15 +1294,7 @@ const handleSizeChange = (newPageSize: number) => {
 }
 
 const getAllDevices = async () => {
-  const res = await fetchHttp.get(
-    '/api/pc/admin/getAllDeviceTypes',
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${getAccessToken()}`
-      }
-    }
-  )
+  const res = await deviceScreenGetAllDeviceTypes()
   if (res && res?.length) {
     deviceTypeOptions.value = res
   }