'feat:设备详情子设备开发，wip:租户管理：租户配置回显待完成'

@@ -5,7 +5,7 @@ import {
   DeviceProfileQueryParam,
   DeviceProfileQueryParam,
   DeviceQueryParam,
   DeviceQueryParam,
 } from '/@/api/device/model/deviceModel';
 } from '/@/api/device/model/deviceModel';
-
+import { ChildDeviceParams } from './model/deviceModel';
 enum DeviceManagerApi {
 enum DeviceManagerApi {
   /**
   /**
    * 设备URL
    * 设备URL
@@ -180,8 +180,18 @@ export const getGATEWAYdevice = async (params: { organization: string }) => {
   );
   );
 };
 };
 
 
+// 获取网关设备
 export const getGATEWAY = (tbDeviceId: string) => {
 export const getGATEWAY = (tbDeviceId: string) => {
   return defHttp.get({
   return defHttp.get({
     url: '/device/gateway/' + tbDeviceId,
     url: '/device/gateway/' + tbDeviceId,
   });
   });
 };
 };
+
+// 获取子设备的分页
+export const getChildDevicePage = (params: ChildDeviceParams) => {
+  console.log(params);
+  return defHttp.get({
+    url: '/device/relation',
+    params,
+  });
+};

@@ -41,3 +41,7 @@ export interface DeviceProfileModel {
   createTime: string;
   createTime: string;
   description: string;
   description: string;
 }
 }
+
+export type ChildDeviceParams = BasicPageParams & {
+  formId: string;
+};

@@ -48,10 +48,18 @@ export async function deleteTenantProfileApi(params?: DeleteTenantProfilesParam)
 
 
 export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
 export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
   return defHttp.get({
   return defHttp.get({
-    params: params,
     url: Api.getTenantProfile,
     url: Api.getTenantProfile,
+    params,
   });
   });
 };
 };
+export const selectTenantProfileApi = async (params?: QueryTenantProfilesParam) => {
+  const { items } = await getTableTenantProfileApi(params);
+  items.forEach((item) => {
+    item.label = item.name;
+    item.value = item.id.id;
+  });
+  return Promise.resolve<any[]>(items);
+};
 
 
 export async function saveTenantProfileApi(params: tenantProfileDTO) {
 export async function saveTenantProfileApi(params: tenantProfileDTO) {
   await defHttp.post(
   await defHttp.post(
@@ -75,33 +83,33 @@ export function getTenantAdminPage(params: TenantAdminPageRequestParams) {
 
 
 export async function saveTenantAdmin(params: UserDTO) {
 export async function saveTenantAdmin(params: UserDTO) {
   await defHttp.post({
   await defHttp.post({
-    params: params,
+    params,
     url: Api.saveTenantAdmin,
     url: Api.saveTenantAdmin,
   });
   });
 }
 }
 
 
 export async function updateOrCreateTenant(params: TenantRequestDTO) {
 export async function updateOrCreateTenant(params: TenantRequestDTO) {
   await defHttp.post({
   await defHttp.post({
-    params: params,
     url: Api.updateOrCreateTenant,
     url: Api.updateOrCreateTenant,
+    params,
   });
   });
 }
 }
 
 
 export async function deleteTenant(tenantIds: Array<string>) {
 export async function deleteTenant(tenantIds: Array<string>) {
   await defHttp.delete({
   await defHttp.delete({
+    url: Api.deleteTenant,
     data: {
     data: {
       ids: tenantIds,
       ids: tenantIds,
     },
     },
-    url: Api.deleteTenant,
   });
   });
 }
 }
 
 
 export async function deleteTenantAdmin(adminIds: Array<string>) {
 export async function deleteTenantAdmin(adminIds: Array<string>) {
   await defHttp.delete({
   await defHttp.delete({
+    url: Api.deleteTenantAdmin,
     data: {
     data: {
       ids: adminIds,
       ids: adminIds,
     },
     },
-    url: Api.deleteTenantAdmin,
   });
   });
 }
 }
 
 
@@ -113,7 +121,7 @@ export async function resetPassword(params: string) {
 
 
 export async function sendMessageOrEmail(params: SendResetPasswordEmailMsg) {
 export async function sendMessageOrEmail(params: SendResetPasswordEmailMsg) {
   await defHttp.post({
   await defHttp.post({
-    params: params,
+    params,
     url: Api.sendMessageOrEmail,
     url: Api.sendMessageOrEmail,
   });
   });
 }
 }

@@ -216,16 +216,22 @@ export const alarmSchemasForm: FormSchema[] = [
 // 子设备
 // 子设备
 export const childDeviceSchemas: FormSchema[] = [
 export const childDeviceSchemas: FormSchema[] = [
   {
   {
-    field: 'icon',
-    label: '设备配置',
-    component: 'Select',
+    field: 'deviceState',
+    label: '设备状态',
     colProps: { span: 6 },
     colProps: { span: 6 },
+    component: 'Select',
     componentProps: {
     componentProps: {
+      size: 'small',
       maxLength: 255,
       maxLength: 255,
+      options: [
+        { label: '待激活', value: 'INACTIVE' },
+        { label: '在线', value: 'ONLINE' },
+        { label: '离线', value: 'OFFLINE' },
+      ],
     },
     },
   },
   },
   {
   {
-    field: 'icon',
+    field: 'name',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
     colProps: { span: 6 },
     colProps: { span: 6 },
@@ -238,32 +244,30 @@ export const childDeviceSchemas: FormSchema[] = [
 export const childDeviceColumns: BasicColumn[] = [
 export const childDeviceColumns: BasicColumn[] = [
   {
   {
     title: '名称',
     title: '名称',
-    dataIndex: 'name',
+    dataIndex: 'tbDeviceName',
     width: 120,
     width: 120,
   },
   },
   {
   {
-    title: '设备配置',
-    dataIndex: 'label',
-    width: 100,
-  },
-  {
     title: '标签',
     title: '标签',
-    dataIndex: 'aaa',
+    dataIndex: 'label',
     width: 160,
     width: 160,
   },
   },
   {
   {
     title: '状态',
     title: '状态',
-    dataIndex: 'bbb',
+    dataIndex: 'deviceState',
+    slots: { customRender: 'deviceState' },
     width: 160,
     width: 160,
   },
   },
   {
   {
     title: '最后连接时间',
     title: '最后连接时间',
-    dataIndex: 'ccc',
+    dataIndex: 'lastOnlineTime',
+    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 160,
     width: 160,
   },
   },
   {
   {
-    title: '创建时间',
-    dataIndex: 'ddd',
+    title: '更新时间',
+    dataIndex: 'createdTime',
+    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 160,
     width: 160,
   },
   },
 ];
 ];

@@ -7,7 +7,7 @@
     centered
     centered
     @ok="dispatchCustomer"
     @ok="dispatchCustomer"
     @cancel="resetFields"
     @cancel="resetFields"
-    :minHeight="150"
+    :minHeight="100"
     okText="分配"
     okText="分配"
   >
   >
     <BasicForm @register="registerForm" />
     <BasicForm @register="registerForm" />

@@ -17,8 +17,8 @@
       /></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
-      /></TabPane>
+        ><ChildDevice :fromId="deviceDetail?.tbDeviceId" />
+      </TabPane>
     </Tabs>
     </Tabs>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
@@ -61,6 +61,7 @@
           deviceDetailRef.value.initMap(longitude, latitude, address);
           deviceDetailRef.value.initMap(longitude, latitude, address);
         }
         }
       });
       });
+
       const closeDrawer = () => {
       const closeDrawer = () => {
         activeKey.value = '1';
         activeKey.value = '1';
       };
       };

@@ -10,9 +10,9 @@
     centered
     centered
   >
   >
     <div class="step-form-form">
     <div class="step-form-form">
-      <Steps :current="current">
-        <Step title="填写设备信息" v-if="!isUpdate" />
-        <Step title="添加设备凭证" v-if="!isUpdate" />
+      <Steps :current="current" v-if="!isUpdate">
+        <Step title="填写设备信息" />
+        <Step title="添加设备凭证" />
       </Steps>
       </Steps>
     </div>
     </div>
     <div class="mt-5">
     <div class="mt-5">

 <template>
 <template>
-  <BasicTable @register="registerTable" />
+  <BasicTable @register="registerTable">
+    <template #deviceState="{ record }">
+      <Tag
+        :color="
+          record.deviceState == DeviceState.INACTIVE
+            ? 'warning'
+            : record.deviceState == DeviceState.ONLINE
+            ? 'success'
+            : 'error'
+        "
+        class="ml-2"
+      >
+        {{
+          record.deviceState == DeviceState.INACTIVE
+            ? '待激活'
+            : record.deviceState == DeviceState.ONLINE
+            ? '在线'
+            : '离线'
+        }}
+      </Tag>
+    </template>
+  </BasicTable>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, onMounted } from 'vue';
+  import { Tag } from 'ant-design-vue';
+  import { DeviceState } from '/@/api/device/model/deviceModel';
   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';
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceManagement',
     name: 'DeviceManagement',
     components: {
     components: {
       BasicTable,
       BasicTable,
+      Tag,
+    },
+    props: {
+      fromId: {
+        type: String,
+        required: true,
+      },
     },
     },
-    setup(_) {
+    setup(props) {
+      console.log(123);
+      onMounted(() => {
+        console.log(props.fromId);
+      });
       const [registerTable] = useTable({
       const [registerTable] = useTable({
+        api: getChildDevicePage,
         columns: childDeviceColumns,
         columns: childDeviceColumns,
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: childDeviceSchemas,
           schemas: childDeviceSchemas,
         },
         },
+        beforeFetch: (data) => {
+          console.log(props.fromId);
+          Reflect.set(data, 'fromId', props.fromId);
+        },
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
@@ -26,6 +65,7 @@
 
 
       return {
       return {
         registerTable,
         registerTable,
+        DeviceState,
       };
       };
     },
     },
   });
   });

@@ -207,7 +207,7 @@
       }
       }
 
 
       function handleDelete(record: Recordable) {
       function handleDelete(record: Recordable) {
-        let ids = [record.id];
+        const ids = [record.id];
         deleteDevice(ids).then(() => {
         deleteDevice(ids).then(() => {
           createMessage.success('删除设备成功');
           createMessage.success('删除设备成功');
           handleSuccess();
           handleSuccess();

@@ -97,9 +97,7 @@
           getTenantRoles(data.record.tenantId).then((result) => {
           getTenantRoles(data.record.tenantId).then((result) => {
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'roleIds', result);
             //为表单赋值
             //为表单赋值
-            setFieldsValue({
-              ...data.record,
-            });
+            setFieldsValue(data.record);
             tenantLogo.value = data.record.icon;
             tenantLogo.value = data.record.icon;
             //编辑模式，菜单名称为不可用
             //编辑模式，菜单名称为不可用
             updateSchema({ field: 'title', componentProps: { disabled: true } });
             updateSchema({ field: 'title', componentProps: { disabled: true } });
@@ -130,6 +128,10 @@
               typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null
               typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 : null,
                 : null,
+            tenantProfileId: {
+              id: values.tenantProfileId,
+              entityType: 'TENANT_PROFILE',
+            },
           };
           };
           updateOrCreateTenant(req).then(() => {
           updateOrCreateTenant(req).then(() => {
             closeDrawer(); //关闭侧框
             closeDrawer(); //关闭侧框

 import { BasicColumn } from '/@/components/Table/src/types/table';
 import { BasicColumn } from '/@/components/Table/src/types/table';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { getAllRoleList } from '/@/api/system/system';
 import { getAllRoleList } from '/@/api/system/system';
+import { selectTenantProfileApi } from '/@/api/tenant/tenantApi';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { RoleEnum } from '/@/enums/roleEnum';
 
 
 export function getBasicColumns(): BasicColumn[] {
 export function getBasicColumns(): BasicColumn[] {
@@ -49,7 +50,6 @@ export const tenantFormSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       maxLength: 36,
       maxLength: 36,
     },
     },
-
     show: false,
     show: false,
   },
   },
   {
   {
@@ -76,7 +76,7 @@ export const tenantFormSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'icon',
     field: 'icon',
-    label: '租户图标: ',
+    label: '租户图标',
     slot: 'iconSelect',
     slot: 'iconSelect',
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
@@ -98,7 +98,7 @@ export const tenantFormSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'name',
     field: 'name',
-    label: '租户名称:',
+    label: '租户名称',
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
@@ -107,7 +107,7 @@ export const tenantFormSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'roleIds',
     field: 'roleIds',
-    label: '租户角色:',
+    label: '租户角色',
     component: 'ApiSelect',
     component: 'ApiSelect',
     required: true,
     required: true,
     componentProps: {
     componentProps: {
@@ -121,6 +121,20 @@ export const tenantFormSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'tenantProfileId',
+    label: '租户配置',
+    component: 'ApiSelect',
+    required: true,
+    componentProps: {
+      api: selectTenantProfileApi,
+      showSearch: true,
+      params: {
+        page: 1,
+        pageSize: 100,
+      },
+    },
+  },
+  {
     field: 'enabled',
     field: 'enabled',
     label: '状态',
     label: '状态',
     component: 'RadioButtonGroup',
     component: 'RadioButtonGroup',
@@ -134,7 +148,7 @@ export const tenantFormSchema: FormSchema[] = [
   },
   },
   {
   {
     field: 'tenantExpireTime',
     field: 'tenantExpireTime',
-    label: '有效期: ',
+    label: '有效期',
     component: 'DatePicker',
     component: 'DatePicker',
     componentProps: {
     componentProps: {
       showTime: true,
       showTime: true,
@@ -142,7 +156,7 @@ export const tenantFormSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    label: '备注: ',
+    label: '备注',
     field: 'description',
     field: 'description',
     component: 'InputTextArea',
     component: 'InputTextArea',
     componentProps: {
     componentProps: {