Merge branch 'main' into f-dev

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","http://192.168.10.106:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
+VITE_PROXY = [["/api","http://192.168.10.111:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -18,6 +18,7 @@ enum EDeviceConfigApi {
   DEVICE_CONFIG_IMPORT = '/device_profile/import',
   DEVICE_CONFIG_IMPORT = '/device_profile/import',
   SET_DEVICE_ISDEFAULT = '/deviceProfile',
   SET_DEVICE_ISDEFAULT = '/deviceProfile',
   FRP_API = '/frp/',
   FRP_API = '/frp/',
+  GET_TB_DEVICE_ID = '/device/get_subset',
 }
 }
 
 
 /**
 /**
@@ -130,3 +131,9 @@ export const frpPutInfoApi = (proxyName: string, enableRemote: number) => {
     url: `${EDeviceConfigApi.FRP_API}${proxyName}/${enableRemote}`,
     url: `${EDeviceConfigApi.FRP_API}${proxyName}/${enableRemote}`,
   });
   });
 };
 };
+
+export const getTbDeviceId = (params: string) => {
+  return defHttp.get({
+    url: `${EDeviceConfigApi.GET_TB_DEVICE_ID}/${params}`,
+  });
+};

@@ -252,6 +252,9 @@ export const childDeviceColumns: BasicColumn[] = [
     title: '名称',
     title: '名称',
     dataIndex: 'tbDeviceName',
     dataIndex: 'tbDeviceName',
     width: 120,
     width: 120,
+    slots: {
+      customRender: 'tbDeviceName',
+    },
   },
   },
   {
   {
     title: '标签',
     title: '标签',

@@ -23,7 +23,10 @@
       </TabPane>
       </TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceDetail.id" /></TabPane>
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
       <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'">
-        <ChildDevice :fromId="deviceDetail?.tbDeviceId" />
+        <ChildDevice
+          :fromId="deviceDetail?.tbDeviceId"
+          @openTbDeviceDetail="handleOpenTbDeviceDetail"
+        />
       </TabPane>
       </TabPane>
       <!-- 网关设备并且场家是TBox -->
       <!-- 网关设备并且场家是TBox -->
       <TabPane
       <TabPane
@@ -64,8 +67,8 @@
       TBoxDetail,
       TBoxDetail,
       HistoryData,
       HistoryData,
     },
     },
-    emits: ['reload', 'register'],
-    setup() {
+    emits: ['reload', 'register', 'openTbDeviceDetail'],
+    setup(_props, { emit }) {
       const activeKey = ref('1');
       const activeKey = ref('1');
       const size = ref('small');
       const size = ref('small');
       const deviceDetailRef = ref();
       const deviceDetailRef = ref();
@@ -86,6 +89,9 @@
         activeKey.value = '1';
         activeKey.value = '1';
       };
       };
 
 
+      const handleOpenTbDeviceDetail = (data: { id: string; tbDeviceId: string }) => {
+        emit('openTbDeviceDetail', data);
+      };
       return {
       return {
         size,
         size,
         activeKey,
         activeKey,
@@ -94,6 +100,7 @@
         deviceDetail,
         deviceDetail,
         deviceDetailRef,
         deviceDetailRef,
         tbDeviceId,
         tbDeviceId,
+        handleOpenTbDeviceDetail,
       };
       };
     },
     },
   });
   });

 <template>
 <template>
   <div style="background-color: #f0f2f5">
   <div style="background-color: #f0f2f5">
     <BasicTable @register="registerTable">
     <BasicTable @register="registerTable">
+      <template #tbDeviceName="{ record }">
+        <div style="color: #619eff" class="cursor-pointer" @click="handleGetTbDeviceId(record)">{{
+          record.tbDeviceName
+        }}</div>
+      </template>
       <template #deviceState="{ record }">
       <template #deviceState="{ record }">
         <Tag
         <Tag
           :color="
           :color="
@@ -28,9 +33,10 @@
   import { defineComponent } from 'vue';
   import { defineComponent } from 'vue';
   import { Tag } from 'ant-design-vue';
   import { Tag } from 'ant-design-vue';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { DeviceState } from '/@/api/device/model/deviceModel';
+  import { getTbDeviceId } from '/@/api/device/deviceConfigApi';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
   import { childDeviceColumns, childDeviceSchemas } from '../../config/detail.config';
   import { childDeviceColumns, childDeviceSchemas } from '../../config/detail.config';
-  import { getChildDevicePage } from '/@/api/device/deviceManager.ts';
+  import { getChildDevicePage } from '/@/api/device/deviceManager';
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceManagement',
     name: 'DeviceManagement',
     components: {
     components: {
@@ -43,7 +49,8 @@
         required: true,
         required: true,
       },
       },
     },
     },
-    setup(props) {
+    emits: ['openTbDeviceDetail'],
+    setup(props, { emit }) {
       const [registerTable] = useTable({
       const [registerTable] = useTable({
         api: getChildDevicePage,
         api: getChildDevicePage,
         columns: childDeviceColumns,
         columns: childDeviceColumns,
@@ -60,9 +67,18 @@
         showIndexColumn: false,
         showIndexColumn: false,
       });
       });
 
 
+      const handleGetTbDeviceId = async (record) => {
+        try {
+          const res = await getTbDeviceId(record.tbDeviceId);
+          if (res && res.id) {
+            emit('openTbDeviceDetail', { id: res.id, tbDeviceId: res.tbDeviceId });
+          }
+        } catch (error) {}
+      };
       return {
       return {
         registerTable,
         registerTable,
         DeviceState,
         DeviceState,
+        handleGetTbDeviceId,
       };
       };
     },
     },
   });
   });

@@ -148,7 +148,12 @@
           />
           />
         </template>
         </template>
       </BasicTable>
       </BasicTable>
-      <DeviceDetailDrawer @register="registerDetailDrawer" />
+      <DeviceDetailDrawer
+        @register="registerDetailDrawer"
+        @open-tb-device-detail="handleOpenTbDeviceDetail"
+      />
+      <DeviceDetailDrawer @register="registerTbDetailDrawer" />
+
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
     </PageWrapper>
     </PageWrapper>
@@ -211,6 +216,7 @@
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
+      const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
 
 
       const [registerTable, { reload, setSelectedRowKeys, setProps }] = useTable({
       const [registerTable, { reload, setSelectedRowKeys, setProps }] = useTable({
         title: '设备列表',
         title: '设备列表',
@@ -318,6 +324,10 @@
         }
         }
       };
       };
 
 
+      const handleOpenTbDeviceDetail = (data: { id: string; tbDeviceId: string }) => {
+        openTbDeviceDrawer(true, data);
+      };
+
       return {
       return {
         registerTable,
         registerTable,
         handleCreate,
         handleCreate,
@@ -341,6 +351,8 @@
         hasBatchDelete,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
         handleReload,
         handleReload,
+        registerTbDetailDrawer,
+        handleOpenTbDeviceDetail,
       };
       };
     },
     },
   });
   });