Merge branch 'perf/edge-device/07-22' into 'main_dev'

perf: 优化边缘实例，由点击路由跳转边缘设备修改为Tab页签方式展示

See merge request yunteng/thingskit-front!1418

@@ -36,7 +36,7 @@
   });
   });
 
 
   function goBack() {
   function goBack() {
-    go('/edge/edge_device/' + edgeId.value);
+    go('/edge/edge_detail/' + edgeId.value);
   }
   }
 </script>
 </script>
 
 

@@ -45,6 +45,7 @@
   const [registerTable, { reload }] = useTable({
   const [registerTable, { reload }] = useTable({
     title: '边缘设备',
     title: '边缘设备',
     columns,
     columns,
+    tableLayout: 'auto',
     api: async ({ page, pageSize, textSearch }) => {
     api: async ({ page, pageSize, textSearch }) => {
       const res = await edgeDevicePage(
       const res = await edgeDevicePage(
         {
         {

@@ -8,7 +8,7 @@
   import { Image } from 'ant-design-vue';
   import { Image } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { syncEdge } from '/@/api/edgeManage/edgeInstance';
   import { syncEdge } from '/@/api/edgeManage/edgeInstance';
-  import { useGo } from '/@/hooks/web/usePage';
+  // import { useGo } from '/@/hooks/web/usePage';
 
 
   const props = defineProps({
   const props = defineProps({
     recordData: {
     recordData: {
@@ -30,7 +30,7 @@
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
 
 
-  const go = useGo();
+  // const go = useGo();
 
 
   const loadStatus = ref(false);
   const loadStatus = ref(false);
 
 
@@ -51,9 +51,9 @@
     }
     }
   };
   };
 
 
-  const handleEventIsOpenEdgeDevice = () => {
-    go('/edge/edge_device/' + props.recordData?.id?.id);
-  };
+  // const handleEventIsOpenEdgeDevice = () => {
+  //   go('/edge/edge_device/' + props.recordData?.id?.id);
+  // };
 </script>
 </script>
 
 
 <template>
 <template>
@@ -74,9 +74,9 @@
           <a-button :loading="loadStatus" type="primary" @click="handleEventIsSyncEdge"
           <a-button :loading="loadStatus" type="primary" @click="handleEventIsSyncEdge"
             >同步边缘</a-button
             >同步边缘</a-button
           >
           >
-          <a-button class="ml-4" type="primary" @click="handleEventIsOpenEdgeDevice"
+          <!-- <a-button class="ml-4" type="primary" @click="handleEventIsOpenEdgeDevice"
             >边缘设备</a-button
             >边缘设备</a-button
-          >
+          > -->
         </div>
         </div>
       </div>
       </div>
     </a-col>
     </a-col>

@@ -3,6 +3,7 @@
   import { ref } from 'vue';
   import { ref } from 'vue';
   import { EdgeMonitoring } from '../EdgeMonitoring';
   import { EdgeMonitoring } from '../EdgeMonitoring';
   import { EdgeEvents } from '../EdgeEvents';
   import { EdgeEvents } from '../EdgeEvents';
+  import { EdgeDevice } from '../EdgeDevice';
   import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance';
   import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance';
   import type { PropType } from 'vue';
   import type { PropType } from 'vue';
 
 
@@ -14,11 +15,12 @@
   });
   });
 
 
   enum ActiveKey {
   enum ActiveKey {
+    EDGE_DEVICE = 'EdgeDevice',
     EDGEMONITORING = 'EdgeMonitoring',
     EDGEMONITORING = 'EdgeMonitoring',
     EDGEEVENTS = 'EdgeEvents',
     EDGEEVENTS = 'EdgeEvents',
   }
   }
 
 
-  const activeKey = ref(ActiveKey.EDGEMONITORING);
+  const activeKey = ref(ActiveKey.EDGE_DEVICE);
 </script>
 </script>
 
 
 <template>
 <template>
@@ -29,6 +31,13 @@
         type="card"
         type="card"
         class="w-full h-full bg-light-50 !p-4 dark:bg-dark-900"
         class="w-full h-full bg-light-50 !p-4 dark:bg-dark-900"
       >
       >
+        <Tabs.TabPane tab="边缘设备" :key="ActiveKey.EDGE_DEVICE">
+          <EdgeDevice
+            v-if="recordData"
+            :recordData="recordData"
+            class="p-4 bg-neutral-100 dark:bg-dark-700"
+          />
+        </Tabs.TabPane>
         <Tabs.TabPane tab="边缘监控" :key="ActiveKey.EDGEMONITORING">
         <Tabs.TabPane tab="边缘监控" :key="ActiveKey.EDGEMONITORING">
           <EdgeMonitoring
           <EdgeMonitoring
             v-if="recordData"
             v-if="recordData"

@@ -182,6 +182,12 @@
             fontSize: 12,
             fontSize: 12,
           },
           },
         },
         },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+          },
+        },
         xAxis: {
         xAxis: {
           type: 'category',
           type: 'category',
           data: xAxisData,
           data: xAxisData,