From d256d70d92faaa8a21739febba57da7656d8b38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com>
Date: Sun, 10 Nov 2024 20:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91IOT=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/index.ts                        |  4 ++--
 src/views/iot/device/detail/DeviceDetailsModel.vue |  9 +++++----
 src/views/iot/device/detail/index.vue              | 14 ++++++--------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index 5f788ec9..4f61d56d 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -93,11 +93,11 @@ export const DeviceApi = {
 
   // 获取设备属性最新数据
   getDevicePropertiesLatestData: async (params: any) => {
-    return await request.get({ url: `/iot/device/data/latest-data`, params })
+    return await request.get({ url: `/iot/device/data/latest`, params })
   },
 
   // 获取设备属性历史数据
   getDevicePropertiesHistoryData: async (params: any) => {
-    return await request.get({ url: `/iot/device/data/history-data`, params })
+    return await request.get({ url: `/iot/device/data/history`, params })
   }
 }
diff --git a/src/views/iot/device/detail/DeviceDetailsModel.vue b/src/views/iot/device/detail/DeviceDetailsModel.vue
index 40c1a89a..9af72bb1 100644
--- a/src/views/iot/device/detail/DeviceDetailsModel.vue
+++ b/src/views/iot/device/detail/DeviceDetailsModel.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
-    <el-tabs>
-      <el-tab-pane label="运行状态">
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="运行状态" name="status">
         <ContentWrap>
           <!-- 搜索工作栏 -->
           <el-form
@@ -68,10 +68,10 @@
           <DeviceDataDetail ref="detailRef" :device="device" :product="product" />
         </ContentWrap>
       </el-tab-pane>
-      <el-tab-pane label="事件管理">
+      <el-tab-pane label="事件管理" name="event">
         <p>事件管理</p>
       </el-tab-pane>
-      <el-tab-pane label="服务调用">
+      <el-tab-pane label="服务调用" name="service">
         <p>服务调用</p>
       </el-tab-pane>
     </el-tabs>
@@ -94,6 +94,7 @@ const queryParams = reactive({
 })
 
 const queryFormRef = ref() // 搜索的表单
+const activeTab = ref('status') // 默认选中的标签
 
 /** 查询列表 */
 const getList = async () => {
diff --git a/src/views/iot/device/detail/index.vue b/src/views/iot/device/detail/index.vue
index be6eec79..4d6e9b60 100644
--- a/src/views/iot/device/detail/index.vue
+++ b/src/views/iot/device/detail/index.vue
@@ -6,13 +6,13 @@
     @refresh="getDeviceData(id)"
   />
   <el-col>
-    <el-tabs>
-      <el-tab-pane label="设备信息">
-        <DeviceDetailsInfo :product="product" :device="device" />
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="设备信息" name="info">
+        <DeviceDetailsInfo v-if="activeTab === 'info'" :product="product" :device="device" />
       </el-tab-pane>
       <el-tab-pane label="Topic 列表" />
-      <el-tab-pane label="物模型数据">
-        <DeviceDetailsModel :product="product" :device="device" />
+      <el-tab-pane label="物模型数据" name="model">
+        <DeviceDetailsModel v-if="activeTab === 'model'" :product="product" :device="device" />
       </el-tab-pane>
       <el-tab-pane label="子设备管理" v-if="product.deviceType === DeviceTypeEnum.GATEWAY" />
       <el-tab-pane label="设备影子" />
@@ -35,6 +35,7 @@ const id = Number(route.params.id) // 编号
 const loading = ref(true) // 加载中
 const product = ref<ProductVO>({} as ProductVO) // 产品详情
 const device = ref<DeviceVO>({} as DeviceVO) // 设备详情
+const activeTab = ref('info') // 默认激活的标签页
 
 /** 获取设备详情 */
 const getDeviceData = async (id: number) => {
@@ -51,11 +52,8 @@ const getDeviceData = async (id: number) => {
 /** 获取产品详情 */
 const getProductData = async (id: number) => {
   product.value = await ProductApi.getProduct(id)
-  console.log(product.value)
 }
 
-/** 获取物模型 */
-
 /** 初始化 */
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由