Merge branch 'f-dev' into 'main'

revert：变换设备列表状态位置

See merge request huang/yun-teng-iot-front!243

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/4 xl:w-1/5"
-        @select="handleSelect"
-        style="position: relative"
-        ref="organizationIdTreeRef"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable
         style="flex: auto"
         @register="registerTable"

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/4 xl:w-1/5"
-        @select="handleSelect"
-        ref="organizationIdTreeRef"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable
         style="flex: auto"
         @register="registerTable"

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/4 xl:w-1/5"
-        @select="handleSelect"
-        ref="organizationIdTreeRef"
-        style="position: relative"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable
         style="flex: auto"
         :clickToRowSelect="false"

@@ -11,6 +11,7 @@
       :replaceFields="{ key: 'id', title: 'name' }"
       :selectedKeys="selectedKeys"
       @select="handleSelect"
+      v-bind="$attrs"
     />
   </div>
 </template>
@@ -18,6 +19,7 @@
   import { onMounted, ref } from 'vue';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { getOrganizationList } from '/@/api/system/system';
+
   const emit = defineEmits(['select']);
   const treeData = ref<TreeItem[]>([]);
   const selectedKeys = ref<string[]>();

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/4 xl:w-1/5"
-        @select="handleSelect"
-        ref="organizationIdTreeRef"
-        style="position: relative"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable
         style="flex: auto"
         :clickToRowSelect="false"

@@ -16,7 +16,7 @@
             </div>
             <Tooltip>
               <template #title>
-                设备数 :{{ growCardList?.deviceInfo.sumCount }} 今日新增
+                设备数 : {{ growCardList?.deviceInfo.sumCount }} 今日新增
                 {{ toThousands(growCardList?.deviceInfo?.todayAdd) }}
               </template>
               <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
@@ -59,8 +59,8 @@
               <template #title>
                 {{
                   !isAdmin(role)
-                    ? `告警数：今日新增${toThousands(growCardList?.alarmInfo?.todayAdd)}`
-                    : `租户总量：今日新增${toThousands(growCardList?.alarmInfo?.todayAdd)}`
+                    ? `告警数：今日新增 ${toThousands(growCardList?.alarmInfo?.todayAdd)}`
+                    : `租户总量：今日新增 ${toThousands(growCardList?.alarmInfo?.todayAdd)}`
                 }}
               </template>
               <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
@@ -106,8 +106,10 @@
               <template #title>
                 {{
                   !isAdmin(role)
-                    ? `消息数：今日新增${toThousands(growCardList?.messageInfo?.todayMessageAdd)}`
-                    : `客户总量：今日新增${toThousands(growCardList?.messageInfo?.todayMessageAdd)}`
+                    ? `消息数：今日新增 ${toThousands(growCardList?.messageInfo?.todayMessageAdd)}`
+                    : `客户总量：今日新增 ${toThousands(
+                        growCardList?.messageInfo?.todayMessageAdd
+                      )}`
                 }}
               </template>
               <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />

@@ -6,6 +6,12 @@ import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
+    title: '状态',
+    dataIndex: 'deviceState',
+    width: 120,
+    slots: { customRender: 'deviceState' },
+  },
+  {
     title: '设备图片',
     dataIndex: 'deviceInfo.avatar',
     width: 120,
@@ -45,12 +51,6 @@ export const columns: BasicColumn[] = [
     width: 180,
   },
   {
-    title: '状态',
-    dataIndex: 'deviceState',
-    width: 120,
-    slots: { customRender: 'deviceState' },
-  },
-  {
     title: '最后连接时间',
     dataIndex: 'lastOnlineTime',
     format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/6 xl:w-1/5"
-        @select="handleSelect"
-        ref="organizationIdTreeRef"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
           <Authority value="api:yt:device:post">

 <template>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree
-        class="w-1/4 xl:w-1/5"
-        @select="handleSelect"
-        ref="organizationIdTreeRef"
-      />
+      <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable
         style="flex: auto"
         :clickToRowSelect="false"