Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teabmition BUG

See merge request yunteng/thingskit-front!562

@@ -51,6 +51,7 @@ export interface DeviceModel {
   organizationId: string;
   customerId?: string;
   alias?: string;
+  tbDeviceId?: string;
 }
 
 export interface DeviceProfileModel {

@@ -81,11 +81,8 @@ export const genModbusCommand = (data: GenModbusCommandType) => {
 };
 
 export const immediateExecute = (data: ImmediateExecuteTaskType) => {
-  return defHttp.post<Record<'data', boolean>>(
-    {
-      url: Api.IMMEDIATE_EXECUTE,
-      params: data,
-    },
-    { joinParamsToUrl: true }
-  );
+  return defHttp.post<Record<'data', boolean>>({
+    url: Api.IMMEDIATE_EXECUTE,
+    params: data,
+  });
 };

@@ -108,7 +108,7 @@
 </script>
 
 <template>
-  <div class="p-2 bg-gray-200" :style="{ height: `${height - 16}px` }">
+  <div class="p-2 bg-gray-200" :style="{ height: `${height}px` }">
     <div ref="jsonEditorElRef" class="jsoneditor"></div>
   </div>
 </template>
@@ -119,6 +119,11 @@
 
     :deep(.jsoneditor) {
       border: none !important;
+
+      .ace-jsoneditor,
+      textarea.jsoneditor-text {
+        min-height: auto;
+      }
     }
   }
 </style>

@@ -133,6 +133,7 @@
         } = props.schema;
 
         if (isFunction(dynamicRules)) {
+          console.log(dynamicRules(unref(getValues)));
           return dynamicRules(unref(getValues)) as ValidationRule[];
         }
 

@@ -279,7 +279,6 @@
     setSelectedOptions,
     setSelectedTotal,
     reloadPending,
-    reloadPending,
     reloadSelected,
   };
 
@@ -408,7 +407,7 @@
           :key="item.value"
         >
           <span>
-            {{ item.alias + '/' + item.name }}
+            {{ item.alias || item.name }}
           </span>
         </Tag>
         <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">

 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
-
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
@@ -98,19 +98,8 @@ export const formSchema: FormSchema[] = [
   {
     field: 'organizationId',
     label: '所属组织',
-    component: 'ApiTreeSelect',
+    component: 'OrgTreeSelect',
     required: true,
-    componentProps: () => {
-      return {
-        maxLength: 250,
-        placeholder: '请选择所属组织',
-        api: async () => {
-          const data = await getOrganizationList();
-          copyTransFun(data as any as any[]);
-          return data;
-        },
-      };
-    },
   },
   {
     field: 'alarmContactId',

 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 import { emailRule, phoneRule } from '/@/utils/rules';
-
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
@@ -78,14 +78,7 @@ export const formSchema: FormSchema[] = [
     field: 'organizationId',
     label: '所属组织',
     required: true,
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
+    component: 'OrgTreeSelect',
   },
   {
     field: 'phone',

-import { BasicColumn, FormSchema } from '/@/components/Table';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
-import type { FormSchema as QFormSchema } from '/@/components/Form/index';
-
-import { CameraVideoUrl, CameraMaxLength } from '/@/utils/rules';
-import { h } from 'vue';
-import SnHelpMessage from './SnHelpMessage.vue';
-
-export enum CameraPermission {
-  PREVIEW = 'api:yt:video:get',
-  CREATE = 'api:yt:video:post',
-  UPDATE = 'api:yt:video:update',
-  DELETE = 'api:yt:video:delete',
-}
-
-export enum AccessMode {
-  ManuallyEnter = 0,
-  Streaming = 1,
-}
-
-export enum PlayProtocol {
-  HTTP = 0,
-  HTTPS = 1,
-}
-
-export enum StreamType {
-  MASTER = 0,
-  CHILD = 1,
-  THIRD = 2,
-}
-
-export enum PageMode {
-  SPLIT_SCREEN_MODE = 'splitScreen',
-  LIST_MODE = 'listMode',
-  FULL_SCREEN_MODE = 'fullScreenMode',
-}
-
-export enum MediaType {
-  MP4 = 'mp4',
-  M3U8 = 'm3u8',
-}
-
-// 表格列数据
-export const columns: BasicColumn[] = [
-  {
-    title: '封面',
-    dataIndex: 'avatar',
-    width: 80,
-    slots: { customRender: 'img' },
-  },
-  {
-    title: '名字',
-    dataIndex: 'name',
-    width: 120,
-  },
-  {
-    title: '摄像头编号/监控点编号',
-    dataIndex: 'sn',
-    width: 220,
-  },
-  {
-    title: '视频流',
-    dataIndex: 'videoUrl',
-    width: 120,
-  },
-  {
-    title: '所属组织',
-    dataIndex: 'organizationName',
-    width: 160,
-  },
-  {
-    title: '获取方式',
-    dataIndex: 'accessMode',
-    width: 100,
-    slots: { customRender: 'accessMode' },
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 140,
-  },
-];
-
-// 查询字段
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: '摄像头名字',
-    component: 'Input',
-    colProps: { span: 8 },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入摄像头名字',
-    },
-  },
-];
-
-// 弹框配置项
-export const formSchema: QFormSchema[] = [
-  {
-    field: 'avatar',
-    label: '视频封面',
-    slot: 'iconSelect',
-    component: 'Input',
-  },
-  {
-    field: 'name',
-    label: '视频名字',
-    required: true,
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入视频名字',
-      maxLength: 30,
-    },
-    rules: [...CameraMaxLength, { required: true, message: '视频名是必填项' }],
-  },
-  {
-    field: 'organizationId',
-    label: '所属组织',
-    required: true,
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
-  },
-  {
-    label: '视频流获取方式',
-    field: 'accessMode',
-    component: 'RadioGroup',
-    rules: [{ required: true, message: '视频流获取方式为必选项', type: 'number' }],
-    defaultValue: AccessMode.ManuallyEnter,
-    componentProps({ formActionType }) {
-      return {
-        defaultValue: AccessMode.ManuallyEnter,
-        placeholder: '请选择视频流获取方式',
-        options: [
-          { label: '手动输入', value: AccessMode.ManuallyEnter },
-          { label: '流媒体获取', value: AccessMode.Streaming },
-        ],
-        onChange() {
-          formActionType.setFieldsValue({
-            brand: null,
-            sn: null,
-            videoUrl: null,
-            videoPlatformId: null,
-          });
-        },
-      };
-    },
-  },
-  {
-    field: 'brand',
-    label: '视频厂家',
-    component: 'Input',
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.ManuallyEnter;
-    },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入视频厂家',
-    },
-  },
-  {
-    field: 'sn',
-    label: '摄像头编号',
-    required: true,
-    component: 'Input',
-    rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.ManuallyEnter;
-    },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入摄像头编号',
-    },
-  },
-  {
-    field: 'videoUrl',
-    label: '视频流',
-    component: 'Input',
-    required: true,
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.ManuallyEnter;
-    },
-    componentProps: {
-      placeholder: '请输入视频流',
-      maxLength: 255,
-    },
-    rules: [{ required: true, message: '视频流是必填项' }, ...CameraVideoUrl],
-  },
-
-  {
-    field: 'videoPlatformId',
-    label: '流媒体配置',
-    component: 'Select',
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.Streaming;
-    },
-    slot: 'videoPlatformIdSlot',
-    componentProps: {
-      placeholder: '请选择流媒体配置',
-    },
-  },
-  {
-    field: 'streamType',
-    label: '码流',
-    component: 'RadioGroup',
-    defaultValue: StreamType.MASTER,
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.Streaming;
-    },
-    componentProps: {
-      placeholder: '请选择码流',
-      defaultValue: StreamType.MASTER,
-      options: [
-        { label: '主码流', value: StreamType.MASTER },
-        { label: '子码流', value: StreamType.CHILD },
-        { label: '第三码流', value: StreamType.THIRD },
-      ],
-    },
-  },
-  {
-    field: 'playProtocol',
-    label: '播放协议',
-    component: 'RadioGroup',
-    defaultValue: PlayProtocol.HTTP,
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.Streaming;
-    },
-    helpMessage: ['平台使用https的hls协议,需联系海康开放平台专家支持。'],
-    componentProps: {
-      placeholder: '请选择播放协议',
-      defaultValue: PlayProtocol.HTTP,
-      options: [
-        { label: 'http', value: PlayProtocol.HTTP },
-        { label: 'https', value: PlayProtocol.HTTPS },
-      ],
-    },
-  },
-  {
-    field: 'sn',
-    label: h(SnHelpMessage) as any,
-    component: 'Input',
-    rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
-    ifShow({ values }) {
-      return values.accessMode === AccessMode.Streaming;
-    },
-    componentProps: {
-      placeholder: '请输入监控点编号',
-    },
-  },
-];
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { FormSchema as QFormSchema, useComponentRegister } from '/@/components/Form/index';
+
+import { CameraVideoUrl, CameraMaxLength } from '/@/utils/rules';
+import { h } from 'vue';
+import SnHelpMessage from './SnHelpMessage.vue';
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+
+export enum CameraPermission {
+  PREVIEW = 'api:yt:video:get',
+  CREATE = 'api:yt:video:post',
+  UPDATE = 'api:yt:video:update',
+  DELETE = 'api:yt:video:delete',
+}
+
+export enum AccessMode {
+  ManuallyEnter = 0,
+  Streaming = 1,
+}
+
+export enum PlayProtocol {
+  HTTP = 0,
+  HTTPS = 1,
+}
+
+export enum StreamType {
+  MASTER = 0,
+  CHILD = 1,
+  THIRD = 2,
+}
+
+export enum PageMode {
+  SPLIT_SCREEN_MODE = 'splitScreen',
+  LIST_MODE = 'listMode',
+  FULL_SCREEN_MODE = 'fullScreenMode',
+}
+
+export enum MediaType {
+  MP4 = 'mp4',
+  M3U8 = 'm3u8',
+}
+
+// 表格列数据
+export const columns: BasicColumn[] = [
+  {
+    title: '封面',
+    dataIndex: 'avatar',
+    width: 80,
+    slots: { customRender: 'img' },
+  },
+  {
+    title: '名字',
+    dataIndex: 'name',
+    width: 120,
+  },
+  {
+    title: '摄像头编号/监控点编号',
+    dataIndex: 'sn',
+    width: 220,
+  },
+  {
+    title: '视频流',
+    dataIndex: 'videoUrl',
+    width: 120,
+  },
+  {
+    title: '所属组织',
+    dataIndex: 'organizationName',
+    width: 160,
+  },
+  {
+    title: '获取方式',
+    dataIndex: 'accessMode',
+    width: 100,
+    slots: { customRender: 'accessMode' },
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 140,
+  },
+];
+
+// 查询字段
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '摄像头名字',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入摄像头名字',
+    },
+  },
+];
+
+// 弹框配置项
+export const formSchema: QFormSchema[] = [
+  {
+    field: 'avatar',
+    label: '视频封面',
+    slot: 'iconSelect',
+    component: 'Input',
+  },
+  {
+    field: 'name',
+    label: '视频名字',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入视频名字',
+      maxLength: 30,
+    },
+    rules: [...CameraMaxLength, { required: true, message: '视频名是必填项' }],
+  },
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    required: true,
+    component: 'OrgTreeSelect',
+  },
+  {
+    label: '视频流获取方式',
+    field: 'accessMode',
+    component: 'RadioGroup',
+    rules: [{ required: true, message: '视频流获取方式为必选项', type: 'number' }],
+    defaultValue: AccessMode.ManuallyEnter,
+    componentProps({ formActionType }) {
+      return {
+        defaultValue: AccessMode.ManuallyEnter,
+        placeholder: '请选择视频流获取方式',
+        options: [
+          { label: '手动输入', value: AccessMode.ManuallyEnter },
+          { label: '流媒体获取', value: AccessMode.Streaming },
+        ],
+        onChange() {
+          formActionType.setFieldsValue({
+            brand: null,
+            sn: null,
+            videoUrl: null,
+            videoPlatformId: null,
+          });
+        },
+      };
+    },
+  },
+  {
+    field: 'brand',
+    label: '视频厂家',
+    component: 'Input',
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.ManuallyEnter;
+    },
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入视频厂家',
+    },
+  },
+  {
+    field: 'sn',
+    label: '摄像头编号',
+    required: true,
+    component: 'Input',
+    rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.ManuallyEnter;
+    },
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入摄像头编号',
+    },
+  },
+  {
+    field: 'videoUrl',
+    label: '视频流',
+    component: 'Input',
+    required: true,
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.ManuallyEnter;
+    },
+    componentProps: {
+      placeholder: '请输入视频流',
+      maxLength: 255,
+    },
+    rules: [{ required: true, message: '视频流是必填项' }, ...CameraVideoUrl],
+  },
+
+  {
+    field: 'videoPlatformId',
+    label: '流媒体配置',
+    component: 'Select',
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.Streaming;
+    },
+    slot: 'videoPlatformIdSlot',
+    componentProps: {
+      placeholder: '请选择流媒体配置',
+    },
+  },
+  {
+    field: 'streamType',
+    label: '码流',
+    component: 'RadioGroup',
+    defaultValue: StreamType.MASTER,
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.Streaming;
+    },
+    componentProps: {
+      placeholder: '请选择码流',
+      defaultValue: StreamType.MASTER,
+      options: [
+        { label: '主码流', value: StreamType.MASTER },
+        { label: '子码流', value: StreamType.CHILD },
+        { label: '第三码流', value: StreamType.THIRD },
+      ],
+    },
+  },
+  {
+    field: 'playProtocol',
+    label: '播放协议',
+    component: 'RadioGroup',
+    defaultValue: PlayProtocol.HTTP,
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.Streaming;
+    },
+    helpMessage: ['平台使用https的hls协议,需联系海康开放平台专家支持。'],
+    componentProps: {
+      placeholder: '请选择播放协议',
+      defaultValue: PlayProtocol.HTTP,
+      options: [
+        { label: 'http', value: PlayProtocol.HTTP },
+        { label: 'https', value: PlayProtocol.HTTPS },
+      ],
+    },
+  },
+  {
+    field: 'sn',
+    label: h(SnHelpMessage) as any,
+    component: 'Input',
+    rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
+    ifShow({ values }) {
+      return values.accessMode === AccessMode.Streaming;
+    },
+    componentProps: {
+      placeholder: '请输入监控点编号',
+    },
+  },
+];

@@ -5,8 +5,11 @@
   import { computed, ref, unref } from 'vue';
   import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
+  import { OrganizationListItem } from '/@/api/system/model/systemModel';
+  import { useRole } from '/@/hooks/business/useRole';
 
   const [registerDrawer, { openDrawer }] = useDrawer();
+  const { isCustomerUser } = useRole();
 
   const props = withDefaults(
     defineProps<{
@@ -19,6 +22,8 @@
     }
   );
 
+  const needReload = ref(true);
+
   const emit = defineEmits(['change']);
 
   const handleOpenCreate = () => {
@@ -27,7 +32,9 @@
 
   const timespan = ref(Date.now());
 
-  const getBindProps = computed(() => {
+  const orgList = ref<Recordable[]>([]);
+
+  const getBindProps = computed<Recordable>(() => {
     const { value, apiTreeSelectProps = {} } = props;
     const { params = {} } = apiTreeSelectProps;
     return {
@@ -37,7 +44,17 @@
       maxLength: 250,
       ...apiTreeSelectProps,
       value,
-      api: getOrganizationList,
+      api: async (params: OrganizationListItem) => {
+        try {
+          if (!unref(needReload)) return unref(orgList);
+          const result = ((await getOrganizationList(params)) as unknown as Recordable[]) || [];
+          orgList.value = result;
+          needReload.value = false;
+          return result;
+        } catch (error) {
+          return unref(orgList);
+        }
+      },
       params: { ...params, _t: unref(timespan) },
       onChange: (...args: any[]) => {
         emit('change', ...args);
@@ -45,7 +62,13 @@
     };
   });
 
+  const getShowCreate = computed(() => {
+    const { showCreate } = props;
+    return unref(isCustomerUser) ? false : showCreate;
+  });
+
   const handleReload = () => {
+    needReload.value = true;
     timespan.value = Date.now();
   };
 </script>
@@ -53,7 +76,7 @@
 <template>
   <section class="flex">
     <ApiTreeSelect v-bind="getBindProps" />
-    <Button v-if="showCreate" type="link" @click="handleOpenCreate">新增组织</Button>
-    <OrganizationDrawer v-if="showCreate" @register="registerDrawer" @success="handleReload" />
+    <Button v-if="getShowCreate" type="link" @click="handleOpenCreate">新增组织</Button>
+    <OrganizationDrawer v-if="getShowCreate" @register="registerDrawer" @success="handleReload" />
   </section>
 </template>

 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
 import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 export enum Platform {
   PHONE = 'phone',
   PC = 'pc',
@@ -126,14 +128,7 @@ export const formSchema: FormSchema[] = [
     field: 'organizationId',
     label: '所属组织',
     required: true,
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
+    component: 'OrgTreeSelect',
   },
   {
     field: 'platform',

 import { FormSchema } from '/@/components/Table';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
 import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '../common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+
 export enum Platform {
   PHONE = 0,
   PC = 1,
@@ -80,29 +83,8 @@ export const formSchema: FormSchema[] = [
     field: 'organizationId',
     label: '所属组织',
     required: true,
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
+    component: 'OrgTreeSelect',
   },
-  // {
-  //   field: 'state',
-  //   label: '发布状态',
-  //   required: true,
-  //   component: 'RadioGroup',
-  //   defaultValue: Platform.PC,
-  //   componentProps: {
-  //     defaultValue: Platform.PC,
-  //     options: [
-  //       { label: '未发布', value: Platform.PC },
-  //       { label: '已发布', value: Platform.PHONE },
-  //     ],
-  //   },
-  // },
   {
     field: 'remark',
     label: '备注',

@@ -182,7 +182,7 @@
       Reflect.set(params, 'scope', 'LATEST_TELEMETRY');
       Reflect.set(params, 'entityType', 'DEVICE');
     }
-    socketMessage.sendValue.tsSubCmds.push(params);
+    socketMessage.sendValue.tsSubCmds = [params];
     const { send, close } = useWebSocket(socketMessage.server, {
       onConnected() {
         send(JSON.stringify(socketMessage.sendValue));

-import { BasicColumn, FormSchema } from '/@/components/Table';
-import { h } from 'vue';
-import { Tag } from 'ant-design-vue';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-import { getAuthCache } from '/@/utils/auth';
-import { isAdmin } from '/@/enums/roleEnum';
-
-// 表格配置
-export const columns: BasicColumn[] = [
-  {
-    title: '接口名称',
-    dataIndex: 'interfaceName',
-    width: 150,
-  },
-  {
-    title: '接口类型',
-    dataIndex: 'interfaceType',
-    width: 80,
-    format(text) {
-      return text === 'SYSTEM' ? '系统默认' : '自定义';
-    },
-  },
-  {
-    title: '请求方式',
-    dataIndex: 'requestContentType',
-    width: 90,
-    format(text) {
-      return Number(text) === 0 ? '普通请求' : Number(text) === 1 ? 'SQL请求' : 'websocket请求';
-    },
-  },
-  {
-    title: '接口内容',
-    dataIndex: 'content',
-    width: 80,
-    slots: { customRender: 'content' },
-  },
-  {
-    title: '状态',
-    dataIndex: 'state',
-    width: 80,
-    customRender: ({ record }) => {
-      const color = record.state == 1 ? 'green' : 'red';
-      const text = record.state == 1 ? '发布' : '未发布';
-      return h(Tag, { color: color }, () => text);
-    },
-  },
-];
-
-// 查询配置
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: '接口名称',
-    component: 'Input',
-    colProps: { span: 7 },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入接口名称',
-    },
-  },
-  {
-    field: 'state',
-    label: '发布状态',
-    component: 'Select',
-    colProps: { span: 7 },
-    componentProps: {
-      options: [
-        {
-          label: '发布',
-          value: 1,
-        },
-        {
-          label: '未发布',
-          value: 0,
-        },
-      ],
-      placeholder: '请选择发布状态',
-    },
-  },
-  {
-    field: 'interfaceType',
-    label: '接口类型',
-    component: 'Select',
-    colProps: { span: 7 },
-    componentProps: {
-      options: [
-        {
-          label: '系统默认',
-          value: 'SYSTEM',
-        },
-        {
-          label: '自定义',
-          value: 'CUSTOM',
-        },
-      ],
-      placeholder: '请选择接口类型',
-    },
-    ifShow: ({}) => {
-      const userInfo: any = getAuthCache(USER_INFO_KEY);
-      const role: string = userInfo?.roles[0];
-      if (isAdmin(role)) return true;
-      else return false;
-    },
-  },
-];
-
-//表单配置
-export const schemas: FormSchema[] = [
-  {
-    field: 'interfaceName',
-    label: '接口名称',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入接口名称',
-    },
-  },
-  // {
-  //   field: 'interfaceType',
-  //   component: 'ApiRadioGroup',
-  //   label: '接口类型',
-  //   required: true,
-  //   colProps: {
-  //     span: 8,
-  //   },
-  //   defaultValue: 'SYSTEM',
-  //   componentProps: {
-  //     api: findDictItemByCode,
-  //     params: {
-  //       dictCode: 'interface_Type',
-  //     },
-  //     labelField: 'itemText',
-  //     valueField: 'itemValue',
-  //   },
-  // },
-  {
-    field: 'interfaceType',
-    component: 'ApiRadioGroup',
-    label: '接口类型',
-    required: true,
-    colProps: {
-      span: 8,
-    },
-    defaultValue: 'CUSTOM',
-    componentProps: {
-      options: [
-        {
-          label: '系统默认',
-          value: 'SYSTEM',
-        },
-        {
-          label: '自定义',
-          value: 'CUSTOM',
-        },
-      ],
-    },
-    ifShow: ({}) => {
-      const userInfo: any = getAuthCache(USER_INFO_KEY);
-      const role: string = userInfo?.roles[0];
-      if (isAdmin(role)) return true;
-      else return false;
-    },
-  },
-  {
-    field: 'requestContentType',
-    label: '请求方式',
-    component: 'ApiSelect',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: '0',
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      return {
-        api: findDictItemByCode,
-        params: {
-          dictCode: 'dataview_select_methods',
-        },
-        placeholder: '请选择请求方式',
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        getPopupContainer: () => document.body,
-        async onChange(e) {
-          setFieldsValue({
-            requestOriginUrl: '',
-            requestHttpTypeAndUrl: {
-              requestHttpType: undefined,
-              requestUrl: '',
-            },
-          });
-          updateSchema({
-            field: 'requestHttpTypeAndUrl',
-            componentProps: {
-              type: e,
-            },
-          });
-          updateSchema({
-            field: 'requestOriginUrl',
-            componentProps: {
-              placeholder: `${
-                e === '0' ? '示例：http://127.0.0.1' : e === '2' ? '示例：ws://127.0.0.1' : ''
-              }`,
-            },
-          });
-        },
-      };
-    },
-  },
-  {
-    field: 'originUrlType',
-    label: '地址类型',
-    component: 'ApiSelect',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: 'server_url',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        placeholder: '请选择地址类型',
-        api: findDictItemByCode,
-        params: {
-          dictCode: 'dataview_select_origin_type',
-        },
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        onChange: (e) => {
-          if (e) {
-            setFieldsValue({
-              requestOriginUrl: '',
-            });
-          }
-        },
-      };
-    },
-  },
-  {
-    field: 'requestOriginUrl',
-    label: '源地址',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    componentProps: ({ formActionType }) => {
-      const { getFieldsValue } = formActionType;
-      const type = getFieldsValue()?.requestContentType;
-      return {
-        placeholder: `${
-          type === '0' ? '示例：http://127.0.0.1' : type === '2' ? '示例：ws://127.0.0.1' : ''
-        }`,
-      };
-    },
-    ifShow: ({ values }) => values['originUrlType'] === 'custom_url',
-  },
-  {
-    field: 'requestHttpTypeAndUrl',
-    label: '请求类型&地址',
-    component: 'InputGroup',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: ({ formActionType }) => {
-      const { getFieldsValue } = formActionType;
-      return {
-        type: getFieldsValue().requestContentType,
-      };
-    },
-  },
-  {
-    field: 'fillAddress',
-    label: '完整地址',
-    component: 'Input',
-    slot: 'slotFillAddress',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => {
-      return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
-    },
-  },
-  {
-    field: 'slotServerAddress',
-    label: '完整地址',
-    component: 'Input',
-    slot: 'slotServerAddress',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => {
-      return values['originUrlType'] === 'server_url';
-    },
-  },
-  {
-    field: 'requestSQLKey',
-    label: '键名',
-    colProps: { span: 6 },
-    component: 'Input',
-    defaultValue: 'sql',
-    componentProps: {
-      disabled: true,
-    },
-    ifShow: ({ values }) => values['requestContentType'] === '1',
-  },
-  {
-    field: 'requestSQLContent',
-    label: '键值',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    defaultValue: 'select * from  where',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入键值',
-      rows: 6,
-    },
-    ifShow: ({ values }) => values['requestContentType'] === '1',
-  },
-  {
-    field: 'slot',
-    label: '参数设置',
-    component: 'Input',
-    slot: 'selectMethods',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => values['requestContentType'] !== '1',
-  },
-  {
-    field: 'testSlot',
-    label: '',
-    component: 'Input',
-    slot: 'testSql',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => values['requestContentType'] === '1',
-  },
-];
-
-//表格表头配置
-export const editCellTableTHeadConfig = ['序号', '内置参数', '参数名', '是否必须', '操作'];
-export const editTestCellTableTHeadConfig = ['内置参数', '参数名', '参数值'];
-export const editTestCellTableTHeaderConfig = ['序号', '参数名', '参数值', '是否必须', '操作'];
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
+import { isAdmin } from '/@/enums/roleEnum';
+
+// 表格配置
+export const columns: BasicColumn[] = [
+  {
+    title: '接口名称',
+    dataIndex: 'interfaceName',
+    width: 150,
+  },
+  {
+    title: '接口类型',
+    dataIndex: 'interfaceType',
+    width: 80,
+    format(text) {
+      return text === 'SYSTEM' ? '系统默认' : '自定义';
+    },
+  },
+  {
+    title: '请求方式',
+    dataIndex: 'requestContentType',
+    width: 90,
+    format(text) {
+      return Number(text) === 0 ? '普通请求' : Number(text) === 1 ? 'SQL请求' : 'websocket请求';
+    },
+  },
+  {
+    title: '接口内容',
+    dataIndex: 'content',
+    width: 80,
+    slots: { customRender: 'content' },
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    width: 80,
+    customRender: ({ record }) => {
+      const color = record.state == 1 ? 'green' : 'red';
+      const text = record.state == 1 ? '发布' : '未发布';
+      return h(Tag, { color: color }, () => text);
+    },
+  },
+];
+
+// 查询配置
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '接口名称',
+    component: 'Input',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入接口名称',
+    },
+  },
+  {
+    field: 'state',
+    label: '发布状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '发布',
+          value: 1,
+        },
+        {
+          label: '未发布',
+          value: 0,
+        },
+      ],
+      placeholder: '请选择发布状态',
+    },
+  },
+  {
+    field: 'interfaceType',
+    label: '接口类型',
+    component: 'Select',
+    colProps: { span: 7 },
+    componentProps: {
+      options: [
+        {
+          label: '系统默认',
+          value: 'SYSTEM',
+        },
+        {
+          label: '自定义',
+          value: 'CUSTOM',
+        },
+      ],
+      placeholder: '请选择接口类型',
+    },
+    ifShow: ({}) => {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+      if (isAdmin(role)) return true;
+      else return false;
+    },
+  },
+];
+
+//表单配置
+export const schemas: FormSchema[] = [
+  {
+    field: 'interfaceName',
+    label: '接口名称',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入接口名称',
+    },
+  },
+  // {
+  //   field: 'interfaceType',
+  //   component: 'ApiRadioGroup',
+  //   label: '接口类型',
+  //   required: true,
+  //   colProps: {
+  //     span: 8,
+  //   },
+  //   defaultValue: 'SYSTEM',
+  //   componentProps: {
+  //     api: findDictItemByCode,
+  //     params: {
+  //       dictCode: 'interface_Type',
+  //     },
+  //     labelField: 'itemText',
+  //     valueField: 'itemValue',
+  //   },
+  // },
+  {
+    field: 'interfaceType',
+    component: 'ApiRadioGroup',
+    label: '接口类型',
+    required: true,
+    colProps: {
+      span: 8,
+    },
+    defaultValue: 'CUSTOM',
+    componentProps: {
+      options: [
+        {
+          label: '系统默认',
+          value: 'SYSTEM',
+        },
+        {
+          label: '自定义',
+          value: 'CUSTOM',
+        },
+      ],
+    },
+    ifShow: ({}) => {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+      if (isAdmin(role)) return true;
+      else return false;
+    },
+  },
+  {
+    field: 'requestContentType',
+    label: '请求方式',
+    component: 'ApiSelect',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: '0',
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'dataview_select_methods',
+        },
+        placeholder: '请选择请求方式',
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+        async onChange(e) {
+          setFieldsValue({
+            requestOriginUrl: '',
+            requestHttpTypeAndUrl: {
+              requestHttpType: undefined,
+              requestUrl: '',
+            },
+          });
+          updateSchema({
+            field: 'requestHttpTypeAndUrl',
+            componentProps: {
+              type: e,
+            },
+          });
+          updateSchema({
+            field: 'requestOriginUrl',
+            componentProps: {
+              placeholder: `${
+                e === '0' ? '示例：http://127.0.0.1' : e === '2' ? '示例：ws://127.0.0.1' : ''
+              }`,
+            },
+          });
+        },
+      };
+    },
+  },
+  {
+    field: 'originUrlType',
+    label: '地址类型',
+    component: 'ApiSelect',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: 'server_url',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择地址类型',
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'dataview_select_origin_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        onChange: (e) => {
+          if (e) {
+            setFieldsValue({
+              requestOriginUrl: '',
+            });
+          }
+        },
+      };
+    },
+  },
+  {
+    field: 'requestOriginUrl',
+    label: '源地址',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Input',
+    componentProps: ({ formActionType }) => {
+      const { getFieldsValue } = formActionType;
+      const type = getFieldsValue()?.requestContentType;
+      return {
+        placeholder: `${
+          type === '0' ? '示例：http://127.0.0.1' : type === '2' ? '示例：ws://127.0.0.1' : ''
+        }`,
+      };
+    },
+    ifShow: ({ values }) => values['originUrlType'] === 'custom_url',
+  },
+  {
+    field: 'requestHttpTypeAndUrl',
+    label: '请求类型&地址',
+    component: 'InputGroup',
+    required: true,
+    colProps: { span: 24 },
+    componentProps: ({ formActionType }) => {
+      const { getFieldsValue } = formActionType;
+      return {
+        type: getFieldsValue().requestContentType,
+      };
+    },
+  },
+  {
+    field: 'fillAddress',
+    label: '完整地址',
+    component: 'Input',
+    slot: 'slotFillAddress',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => {
+      return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
+    },
+  },
+  {
+    field: 'slotServerAddress',
+    label: '完整地址',
+    component: 'Input',
+    slot: 'slotServerAddress',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => {
+      return values['originUrlType'] === 'server_url';
+    },
+  },
+  {
+    field: 'requestSQLKey',
+    label: '键名',
+    colProps: { span: 6 },
+    component: 'Input',
+    defaultValue: 'sql',
+    componentProps: {
+      disabled: true,
+    },
+    ifShow: ({ values }) => values['requestContentType'] === '1',
+  },
+  {
+    field: 'requestSQLContent',
+    label: '键值',
+    colProps: { span: 24 },
+    component: 'InputTextArea',
+    defaultValue: 'select * from  where',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入键值',
+      rows: 6,
+    },
+    ifShow: ({ values }) => values['requestContentType'] === '1',
+  },
+  {
+    field: 'slot',
+    label: '参数设置',
+    component: 'Input',
+    slot: 'selectMethods',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => values['requestContentType'] !== '1',
+  },
+  {
+    field: 'testSlot',
+    label: '',
+    component: 'Input',
+    slot: 'testSql',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => values['requestContentType'] === '1',
+  },
+];
+
+//表格表头配置
+export const editCellTableTHeadConfig = ['序号', '内置参数', '参数名', '是否必须', '操作'];
+export const editTestCellTableTHeadConfig = ['内置参数', '参数名', '参数值'];
+export const editTestCellTableTHeaderConfig = ['序号', '参数名', '参数值', '是否必须', '操作'];

 <template>
   <div>
-    <BasicTable @register="registerTable" :row-selection="rowSelection">
+    <BasicTable
+      @register="registerTable"
+      :row-selection="rowSelection"
+      class="bg-neutral-100 dark:bg-dark-700"
+    >
       <template #content="{ record }">
         <a-button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </a-button>
       </template>
@@ -108,8 +112,10 @@
     showTableSetting: true,
     bordered: true,
     formConfig: {
-      labelWidth: 120,
+      labelWidth: 80,
       schemas: searchFormSchema,
+      baseColProps: { span: 9 },
+      actionColOptions: { span: 6 },
     },
     useSearchForm: true,
     actionColumn: {

@@ -63,12 +63,12 @@
           </div>
         </template>
         <template #deviceProfile="{ record }">
-          <Tag.CheckableTag
+          <Button
             @click="!isCustomer ? goDeviceProfile(record.deviceProfile.name) : null"
-            style="white-space: normal; height: auto; cursor: pointer"
+            type="link"
           >
-            <span style="color: #377dff">{{ record.deviceProfile.name }}</span>
-          </Tag.CheckableTag>
+            {{ record.deviceProfile.name }}
+          </Button>
         </template>
 
         <template #deviceType="{ record }">
@@ -385,10 +385,10 @@
         openGatewayDetailDrawer(true, data);
       };
 
-      const handleUpAndDownRecord = (record: Record<'name', string>) => {
+      const handleUpAndDownRecord = (record: Record<'name' | 'alias', string>) => {
         ROUTER.push({
           path: '/operation/onlinerecord',
-          query: { deviceName: record.name },
+          query: { deviceName: record.alias || record.name },
         });
       };
 

@@ -82,7 +82,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'name',
     width: 120,
     format: (_text: string, record: Recordable) => {
-      return record?.alias ? record?.alias : record?.name;
+      return record?.alias || record?.name;
     },
   },
   {

@@ -150,6 +150,7 @@
     deviceProfile: { default: boolean; enabled: boolean; name: string; transportType: string };
     deviceInfo: { longitude: string; latitude: string; address: string };
     deviceType?: string;
+    alias?: string;
     deviceProfileId: string;
   }
   type MarkerList = DeviceInfo & { marker: any; label: any };
@@ -376,7 +377,7 @@
           width: 330, // 信息窗口宽度
           height: 0, // 信息窗口高度
         };
-        const { name, organizationDTO, deviceState, deviceProfile, deviceType } = record;
+        const { name, alias, organizationDTO, deviceState, deviceProfile, deviceType } = record;
         const { address, longitude, latitude } = record.deviceInfo;
 
         // 创建信息窗口对象
@@ -387,7 +388,7 @@
         let infoWindow = new BMap.InfoWindow(
           `
           <div style="display:flex;justify-content:space-between; margin:20px 0px;">
-            <div style="font-size:16px;font-weight:bold">${name}</div>
+            <div style="font-size:16px;font-weight:bold">${alias || name}</div>
             ${
               deviceState === 'INACTIVE'
                 ? `<div style="display:flex;align-items:center;"><img style="width:15px;height:15px" src="${djh}" class="mr-1">待激活</div>`

-import { ref } from 'vue';
-import { BasicColumn, FormSchema } from '/@/components/Table';
-import type { FormSchema as QFormSchema } from '/@/components/Form/index';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { isTiming, isWeek, isMonth, isFixedTime } from './timeConfig';
-import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
-import {
-  getPacketIntervalByRange,
-  getPacketIntervalByValue,
-  intervalOption,
-} from '../../device/localtion/cpns/TimePeriodForm/helper';
-import moment, { Moment } from 'moment';
-
-export enum QueryWay {
-  LATEST = 'latest',
-  TIME_PERIOD = 'timePeriod',
-}
-export enum SchemaFiled {
-  WAY = 'queryMode',
-  TIME_PERIOD = 'timePeriod',
-  KEYS = 'keys',
-  DATE_RANGE = 'dataRange',
-  START_TS = 'startTs',
-  END_TS = 'endTs',
-  INTERVAL = 'interval',
-  LIMIT = 'limit',
-  AGG = 'agg',
-  ORDER_BY = 'orderBy',
-}
-export const organizationId = ref('');
-
-// 表格配置
-export const columns: BasicColumn[] = [
-  {
-    title: '配置名称',
-    dataIndex: 'name',
-    width: 120,
-  },
-  {
-    title: '所属组织',
-    dataIndex: 'organizationDTO.name',
-    width: 120,
-  },
-  {
-    title: '数据类型',
-    dataIndex: 'dataType',
-    width: 120,
-    format: (_text: string, record: Recordable) => {
-      return record.dataType === 0 ? '原始数据' : '聚合数据';
-    },
-  },
-  {
-    title: '配置状态',
-    dataIndex: 'status',
-    width: 120,
-    slots: { customRender: 'configStatus' },
-  },
-  {
-    title: '执行方式',
-    dataIndex: 'executeWay',
-    width: 160,
-    format: (_text: string, record: Recordable) => {
-      return record.executeWay === 0 ? '立即执行' : '定时执行';
-    },
-  },
-  {
-    title: '执行设备',
-    dataIndex: 'devices',
-    width: 160,
-    slots: { customRender: 'doDeviceSlot' },
-  },
-  {
-    title: '创建人',
-    dataIndex: 'createUserName',
-    width: 180,
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-  },
-];
-export const viewDeviceColumn: BasicColumn[] = [
-  {
-    title: '设备',
-    dataIndex: 'device',
-    width: 80,
-  },
-  {
-    title: '属性',
-    dataIndex: 'attribute',
-    width: 120,
-  },
-];
-
-// 查询配置
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: '配置名称',
-    component: 'Input',
-    colProps: { span: 6 },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入配置名称',
-    },
-  },
-  {
-    field: 'status',
-    label: '配置状态',
-    component: 'Select',
-    colProps: { span: 6 },
-    componentProps: {
-      options: [
-        {
-          label: '启用',
-          value: 1,
-        },
-        {
-          label: '禁用',
-          value: 0,
-        },
-      ],
-      placeholder: '请选择配置状态',
-    },
-  },
-  {
-    field: 'sendTime',
-    label: '创建时间',
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
-    colProps: { span: 6 },
-  },
-];
-
-// 新增编辑配置
-export const formSchema: QFormSchema[] = [
-  {
-    field: 'name',
-    label: '报表名称',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 64,
-      placeholder: '请输入报表名称',
-    },
-  },
-  {
-    field: 'organizationId',
-    label: '所属组织',
-    colProps: { span: 24 },
-    component: 'ApiTreeSelect',
-    required: true,
-    componentProps: () => {
-      return {
-        maxLength: 250,
-        placeholder: '请选择所属组织',
-        api: async () => {
-          const data = await getOrganizationList();
-          copyTransFun(data as any as any[]);
-          return data;
-        },
-        async onChange(e) {
-          organizationId.value = e;
-        },
-      };
-    },
-  },
-  {
-    field: 'remark',
-    label: '描述',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入描述',
-    },
-  },
-  {
-    field: 'executeWay',
-    component: 'RadioGroup',
-    helpMessage: [
-      `立即执行，在创建完报表配置后，启用配置即执行。
-    定时执行，用户定义执行时间，启用后，
-    在满足执行时间条件后，自动执行。`,
-    ],
-    label: '执行方式',
-    colProps: {
-      span: 24,
-    },
-    defaultValue: 0,
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      const options = [
-        {
-          label: '立即执行',
-          value: 0,
-        },
-        {
-          label: '定时执行',
-          value: 1,
-        },
-      ];
-      return {
-        options,
-        placeholder: '请选择执行方式',
-        onChange(e) {
-          let dataCompareOpions: any = [];
-          setFieldsValue({
-            startTs: 1000,
-            interval: 1000,
-          });
-          if (e.target.value == 0) {
-            setFieldsValue({ queryMode: QueryWay.LATEST });
-            dataCompareOpions = [
-              { label: '固定周期', value: QueryWay.LATEST },
-              { label: '自定义周期', value: QueryWay.TIME_PERIOD },
-            ];
-            updateSchema({
-              field: SchemaFiled.WAY,
-              componentProps: {
-                options: dataCompareOpions,
-              },
-            });
-          } else {
-            setFieldsValue({ queryMode: QueryWay.LATEST });
-            setFieldsValue({ startTs: 5000 });
-            setFieldsValue({ interval: 1000 });
-            dataCompareOpions = [{ label: '固定周期', value: QueryWay.LATEST }];
-            updateSchema({
-              defaultValue: QueryWay.LATEST,
-              field: SchemaFiled.WAY,
-              componentProps: {
-                options: dataCompareOpions,
-              },
-            });
-          }
-        },
-        maxLength: 250,
-      };
-    },
-  },
-  {
-    field: 'cycleType',
-    component: 'Select',
-    label: '周期',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: 0,
-    componentProps: {
-      placeholder: '请选择周期',
-      options: [
-        { label: '每日', value: 0 },
-        { label: '每周', value: 1 },
-        { label: '每月', value: 2 },
-      ],
-    },
-    ifShow: ({ values }) => isTiming(values.executeWay),
-  },
-  {
-    field: 'currentCycle',
-    component: 'ApiSelect',
-    label: '每周',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: '0 0 0 ? * MON',
-    componentProps: {
-      placeholder: '请选择周期',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'every_week',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({ values }) => isWeek(values.cycleType),
-  },
-  {
-    field: 'cycleTime',
-    component: 'ApiSelect',
-    label: '每月',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: '0 0 0 1 * ? *',
-    componentProps: {
-      placeholder: '请选择月份',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'every_month',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({ values }) => isMonth(values.cycleType),
-  },
-  {
-    field: 'cronTime',
-    component: 'ApiSelect',
-    label: '时间',
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: '0 0 0  * * ?',
-    componentProps: {
-      placeholder: '请选择时间',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'every_day',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({ values }) => isTiming(values.executeWay),
-  },
-  {
-    field: 'devices',
-    label: '设备',
-    component: 'Select',
-    slot: 'devices',
-    colProps: { span: 24 },
-  },
-  {
-    field: 'dataType',
-    label: '数据类型',
-    required: true,
-    component: 'Select',
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      const options = [
-        { label: '原始数据', value: 0 },
-        { label: '聚合数据', value: 1 },
-      ];
-      return {
-        options,
-        onSelect(e) {
-          let dataCompareOpions: any = [];
-          if (e == 0) {
-            setFieldsValue({ agg: 'NONE' });
-            dataCompareOpions = [{ label: '空', value: AggregateDataEnum.NONE }];
-            updateSchema({
-              field: SchemaFiled.AGG,
-              componentProps: {
-                options: dataCompareOpions,
-              },
-            });
-          } else {
-            setFieldsValue({ agg: '' });
-            dataCompareOpions = [
-              { label: '最小值', value: AggregateDataEnum.MIN },
-              { label: '最大值', value: AggregateDataEnum.MAX },
-              { label: '平均值', value: AggregateDataEnum.AVG },
-              { label: '求和', value: AggregateDataEnum.SUM },
-              { label: '计数', value: AggregateDataEnum.COUNT },
-            ];
-            updateSchema({
-              field: SchemaFiled.AGG,
-              componentProps: {
-                options: dataCompareOpions,
-              },
-            });
-          }
-        },
-        maxLength: 250,
-        placeholder: '请选择属性性质',
-      };
-    },
-    colProps: { span: 24 },
-  },
-  {
-    field: SchemaFiled.AGG,
-    label: '聚合条件',
-    component: 'Select',
-    required: true,
-    componentProps: {
-      placeholder: '请选择聚合条件',
-      getPopupContainer: () => document.body,
-    },
-  },
-  {
-    field: 'limit',
-    required: true,
-    label: '最大条数',
-    component: 'InputNumber',
-    defaultValue: 100,
-    ifShow({ values }) {
-      return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
-    },
-    colProps: { span: 12 },
-    componentProps: {
-      placeholder: '请输入最大条数',
-      min: 7,
-      max: 50000,
-    },
-  },
-  {
-    field: SchemaFiled.WAY,
-    label: '查询周期',
-    component: 'RadioGroup',
-    defaultValue: QueryWay.LATEST,
-    required: true,
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      return {
-        placeholder: '请选择查询周期',
-        options: [
-          { label: '固定周期', value: QueryWay.LATEST },
-          { label: '自定义周期', value: QueryWay.TIME_PERIOD },
-        ],
-        onChange(value) {
-          console.log(value);
-          value === QueryWay.LATEST
-            ? setFieldsValue({
-                [SchemaFiled.DATE_RANGE]: [],
-                [SchemaFiled.START_TS]: null,
-                [SchemaFiled.END_TS]: null,
-              })
-            : setFieldsValue({ [SchemaFiled.START_TS]: null });
-        },
-      };
-    },
-  },
-  {
-    field: SchemaFiled.DATE_RANGE,
-    label: '时间段',
-    component: 'RangePicker',
-    required: true,
-    ifShow({ values }) {
-      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
-    },
-    // componentProps: {
-    //   showTime: {
-    //     defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-    //   },
-    // },
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      let dates: Moment[] = [];
-      return {
-        showTime: {
-          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-        },
-        onCalendarChange(value: Moment[]) {
-          dates = value;
-        },
-        disabledDate(current: Moment) {
-          if (!dates || dates.length === 0 || !current) {
-            return false;
-          }
-          const diffDate = current.diff(dates[0], 'years', true);
-          return Math.abs(diffDate) > 1;
-        },
-        onChange() {
-          dates = [];
-          setFieldsValue({ dateGroupGap: null });
-        },
-        getPopupContainer: () => document.body,
-      };
-    },
-    colProps: {
-      span: 10,
-    },
-  },
-  {
-    field: 'dateGroupGap',
-    label: '分组间隔',
-    component: 'Select',
-    dynamicRules: ({ model }) => {
-      return [
-        {
-          required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
-          message: '分组间隔为必填项',
-          type: 'number',
-        },
-      ];
-    },
-    ifShow({ values }) {
-      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
-    },
-    componentProps({ formModel, formActionType }) {
-      const options =
-        formModel[SchemaFiled.WAY] === QueryWay.LATEST
-          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
-          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
-      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
-        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
-      }
-      return {
-        options,
-        getPopupContainer: () => document.body,
-      };
-    },
-  },
-  {
-    field: SchemaFiled.START_TS,
-    label: '最近时间',
-    component: 'Select',
-    required: true,
-    ifShow({ values }) {
-      return values[SchemaFiled.WAY] == QueryWay.LATEST;
-    },
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      return {
-        defaultValue: 1000,
-        placeholder: '请选择近期时间',
-        options: intervalOption,
-        onChange() {
-          setFieldsValue({ [SchemaFiled.INTERVAL]: null });
-        },
-      };
-    },
-  },
-  {
-    field: SchemaFiled.INTERVAL,
-    label: '间隔时间',
-    component: 'Select',
-    required: true,
-    ifShow({ values }) {
-      return values[SchemaFiled.WAY] == QueryWay.LATEST;
-    },
-    componentProps({ formModel, formActionType }) {
-      const options =
-        formModel[SchemaFiled.WAY] === QueryWay.LATEST
-          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
-          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
-      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
-        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
-      }
-      return {
-        placeholder: '请选择间隔时间',
-        options,
-      };
-    },
-  },
-];
+import { ref } from 'vue';
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { FormSchema as QFormSchema, useComponentRegister } from '/@/components/Form/index';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { isTiming, isWeek, isMonth, isFixedTime } from './timeConfig';
+import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
+import {
+  getPacketIntervalByRange,
+  getPacketIntervalByValue,
+  intervalOption,
+} from '../../device/localtion/cpns/TimePeriodForm/helper';
+import moment, { Moment } from 'moment';
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+export enum QueryWay {
+  LATEST = 'latest',
+  TIME_PERIOD = 'timePeriod',
+}
+export enum SchemaFiled {
+  WAY = 'queryMode',
+  TIME_PERIOD = 'timePeriod',
+  KEYS = 'keys',
+  DATE_RANGE = 'dataRange',
+  START_TS = 'startTs',
+  END_TS = 'endTs',
+  INTERVAL = 'interval',
+  LIMIT = 'limit',
+  AGG = 'agg',
+  ORDER_BY = 'orderBy',
+}
+export const organizationId = ref('');
+
+// 表格配置
+export const columns: BasicColumn[] = [
+  {
+    title: '配置名称',
+    dataIndex: 'name',
+    width: 120,
+  },
+  {
+    title: '所属组织',
+    dataIndex: 'organizationDTO.name',
+    width: 120,
+  },
+  {
+    title: '数据类型',
+    dataIndex: 'dataType',
+    width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record.dataType === 0 ? '原始数据' : '聚合数据';
+    },
+  },
+  {
+    title: '配置状态',
+    dataIndex: 'status',
+    width: 120,
+    slots: { customRender: 'configStatus' },
+  },
+  {
+    title: '执行方式',
+    dataIndex: 'executeWay',
+    width: 160,
+    format: (_text: string, record: Recordable) => {
+      return record.executeWay === 0 ? '立即执行' : '定时执行';
+    },
+  },
+  {
+    title: '执行设备',
+    dataIndex: 'devices',
+    width: 160,
+    slots: { customRender: 'doDeviceSlot' },
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createUserName',
+    width: 180,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+export const viewDeviceColumn: BasicColumn[] = [
+  {
+    title: '设备',
+    dataIndex: 'device',
+    width: 80,
+  },
+  {
+    title: '属性',
+    dataIndex: 'attribute',
+    width: 120,
+  },
+];
+
+// 查询配置
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '配置名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入配置名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '配置状态',
+    component: 'Select',
+    colProps: { span: 6 },
+    componentProps: {
+      options: [
+        {
+          label: '启用',
+          value: 1,
+        },
+        {
+          label: '禁用',
+          value: 0,
+        },
+      ],
+      placeholder: '请选择配置状态',
+    },
+  },
+  {
+    field: 'sendTime',
+    label: '创建时间',
+    component: 'RangePicker',
+    componentProps: {
+      showTime: {
+        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+      },
+    },
+    colProps: { span: 6 },
+  },
+];
+
+// 新增编辑配置
+export const formSchema: QFormSchema[] = [
+  {
+    field: 'name',
+    label: '报表名称',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 64,
+      placeholder: '请输入报表名称',
+    },
+  },
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 24 },
+    component: 'OrgTreeSelect',
+    required: true,
+    componentProps: () => {
+      return {
+        async onChange(e) {
+          organizationId.value = e;
+        },
+      };
+    },
+  },
+  {
+    field: 'remark',
+    label: '描述',
+    colProps: { span: 24 },
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入描述',
+    },
+  },
+  {
+    field: 'executeWay',
+    component: 'RadioGroup',
+    helpMessage: [
+      `立即执行，在创建完报表配置后，启用配置即执行。
+    定时执行，用户定义执行时间，启用后，
+    在满足执行时间条件后，自动执行。`,
+    ],
+    label: '执行方式',
+    colProps: {
+      span: 24,
+    },
+    defaultValue: 0,
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      const options = [
+        {
+          label: '立即执行',
+          value: 0,
+        },
+        {
+          label: '定时执行',
+          value: 1,
+        },
+      ];
+      return {
+        options,
+        placeholder: '请选择执行方式',
+        onChange(e) {
+          let dataCompareOpions: any = [];
+          setFieldsValue({
+            startTs: 1000,
+            interval: 1000,
+          });
+          if (e.target.value == 0) {
+            setFieldsValue({ queryMode: QueryWay.LATEST });
+            dataCompareOpions = [
+              { label: '固定周期', value: QueryWay.LATEST },
+              { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+            ];
+            updateSchema({
+              field: SchemaFiled.WAY,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          } else {
+            setFieldsValue({ queryMode: QueryWay.LATEST });
+            setFieldsValue({ startTs: 5000 });
+            setFieldsValue({ interval: 1000 });
+            dataCompareOpions = [{ label: '固定周期', value: QueryWay.LATEST }];
+            updateSchema({
+              defaultValue: QueryWay.LATEST,
+              field: SchemaFiled.WAY,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          }
+        },
+        maxLength: 250,
+      };
+    },
+  },
+  {
+    field: 'cycleType',
+    component: 'Select',
+    label: '周期',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: 0,
+    componentProps: {
+      placeholder: '请选择周期',
+      options: [
+        { label: '每日', value: 0 },
+        { label: '每周', value: 1 },
+        { label: '每月', value: 2 },
+      ],
+    },
+    ifShow: ({ values }) => isTiming(values.executeWay),
+  },
+  {
+    field: 'currentCycle',
+    component: 'ApiSelect',
+    label: '每周',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: '0 0 0 ? * MON',
+    componentProps: {
+      placeholder: '请选择周期',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_week',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+    ifShow: ({ values }) => isWeek(values.cycleType),
+  },
+  {
+    field: 'cycleTime',
+    component: 'ApiSelect',
+    label: '每月',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: '0 0 0 1 * ? *',
+    componentProps: {
+      placeholder: '请选择月份',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_month',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+    ifShow: ({ values }) => isMonth(values.cycleType),
+  },
+  {
+    field: 'cronTime',
+    component: 'ApiSelect',
+    label: '时间',
+    required: true,
+    colProps: { span: 24 },
+    defaultValue: '0 0 0  * * ?',
+    componentProps: {
+      placeholder: '请选择时间',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'every_day',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+    ifShow: ({ values }) => isTiming(values.executeWay),
+  },
+  {
+    field: 'devices',
+    label: '设备',
+    component: 'Select',
+    slot: 'devices',
+    colProps: { span: 24 },
+  },
+  {
+    field: 'dataType',
+    label: '数据类型',
+    required: true,
+    component: 'Select',
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      const options = [
+        { label: '原始数据', value: 0 },
+        { label: '聚合数据', value: 1 },
+      ];
+      return {
+        options,
+        onSelect(e) {
+          let dataCompareOpions: any = [];
+          if (e == 0) {
+            setFieldsValue({ agg: 'NONE' });
+            dataCompareOpions = [{ label: '空', value: AggregateDataEnum.NONE }];
+            updateSchema({
+              field: SchemaFiled.AGG,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          } else {
+            setFieldsValue({ agg: '' });
+            dataCompareOpions = [
+              { label: '最小值', value: AggregateDataEnum.MIN },
+              { label: '最大值', value: AggregateDataEnum.MAX },
+              { label: '平均值', value: AggregateDataEnum.AVG },
+              { label: '求和', value: AggregateDataEnum.SUM },
+              { label: '计数', value: AggregateDataEnum.COUNT },
+            ];
+            updateSchema({
+              field: SchemaFiled.AGG,
+              componentProps: {
+                options: dataCompareOpions,
+              },
+            });
+          }
+        },
+        maxLength: 250,
+        placeholder: '请选择属性性质',
+      };
+    },
+    colProps: { span: 24 },
+  },
+  {
+    field: SchemaFiled.AGG,
+    label: '聚合条件',
+    component: 'Select',
+    required: true,
+    componentProps: {
+      placeholder: '请选择聚合条件',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'limit',
+    required: true,
+    label: '最大条数',
+    component: 'InputNumber',
+    defaultValue: 100,
+    ifShow({ values }) {
+      return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
+    },
+    colProps: { span: 12 },
+    componentProps: {
+      placeholder: '请输入最大条数',
+      min: 7,
+      max: 50000,
+    },
+  },
+  {
+    field: SchemaFiled.WAY,
+    label: '查询周期',
+    component: 'RadioGroup',
+    defaultValue: QueryWay.LATEST,
+    required: true,
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择查询周期',
+        options: [
+          { label: '固定周期', value: QueryWay.LATEST },
+          { label: '自定义周期', value: QueryWay.TIME_PERIOD },
+        ],
+        onChange(value) {
+          console.log(value);
+          value === QueryWay.LATEST
+            ? setFieldsValue({
+                [SchemaFiled.DATE_RANGE]: [],
+                [SchemaFiled.START_TS]: null,
+                [SchemaFiled.END_TS]: null,
+              })
+            : setFieldsValue({ [SchemaFiled.START_TS]: null });
+        },
+      };
+    },
+  },
+  {
+    field: SchemaFiled.DATE_RANGE,
+    label: '时间段',
+    component: 'RangePicker',
+    required: true,
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
+    },
+    // componentProps: {
+    //   showTime: {
+    //     defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+    //   },
+    // },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      let dates: Moment[] = [];
+      return {
+        showTime: {
+          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+        },
+        onCalendarChange(value: Moment[]) {
+          dates = value;
+        },
+        disabledDate(current: Moment) {
+          if (!dates || dates.length === 0 || !current) {
+            return false;
+          }
+          const diffDate = current.diff(dates[0], 'years', true);
+          return Math.abs(diffDate) > 1;
+        },
+        onChange() {
+          dates = [];
+          setFieldsValue({ dateGroupGap: null });
+        },
+        getPopupContainer: () => document.body,
+      };
+    },
+    colProps: {
+      span: 10,
+    },
+  },
+  {
+    field: 'dateGroupGap',
+    label: '分组间隔',
+    component: 'Select',
+    dynamicRules: ({ model }) => {
+      return [
+        {
+          required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
+          message: '分组间隔为必填项',
+          type: 'number',
+        },
+      ];
+    },
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
+    },
+    componentProps({ formModel, formActionType }) {
+      const options =
+        formModel[SchemaFiled.WAY] === QueryWay.LATEST
+          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
+          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
+      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+      }
+      return {
+        options,
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
+    field: SchemaFiled.START_TS,
+    label: '最近时间',
+    component: 'Select',
+    required: true,
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] == QueryWay.LATEST;
+    },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      return {
+        defaultValue: 1000,
+        placeholder: '请选择近期时间',
+        options: intervalOption,
+        onChange() {
+          setFieldsValue({ [SchemaFiled.INTERVAL]: null });
+        },
+      };
+    },
+  },
+  {
+    field: SchemaFiled.INTERVAL,
+    label: '间隔时间',
+    component: 'Select',
+    required: true,
+    ifShow({ values }) {
+      return values[SchemaFiled.WAY] == QueryWay.LATEST;
+    },
+    componentProps({ formModel, formActionType }) {
+      const options =
+        formModel[SchemaFiled.WAY] === QueryWay.LATEST
+          ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
+          : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
+      if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+        formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+      }
+      return {
+        placeholder: '请选择间隔时间',
+        options,
+      };
+    },
+  },
+];

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { h, ref } from 'vue';
+import { h, ref, unref } from 'vue';
 import { isExistDataManagerNameApi } from '/@/api/datamanager/dataManagerApi';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { BasicColumn, BasicTableProps } from '/@/components/Table';
@@ -8,6 +8,8 @@ import { devicePage } from '/@/api/device/deviceManager';
 import { Tag } from 'ant-design-vue';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { FETCH_SETTING } from '/@/components/Table/src/const';
+import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+import { useMessage } from '/@/hooks/web/useMessage';
 
 const typeValue = ref('');
 export enum CredentialsEnum {
@@ -100,7 +102,8 @@ const deviceTableFormSchema: FormSchema[] = [
     },
   },
 ];
-
+const { clipboardRef, isSuccessRef } = useCopyToClipboard();
+const { createMessage } = useMessage();
 const deviceTableColumn: BasicColumn[] = [
   {
     title: '状态',
@@ -125,8 +128,20 @@ const deviceTableColumn: BasicColumn[] = [
     dataIndex: 'name',
     customRender: ({ record }) => {
       return h('div', [
-        h('div', `${record.alias}/${record.name}`),
-        // h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
+        h(
+          'div',
+          {
+            class: 'cursor-pointer',
+            onClick: () => {
+              clipboardRef.value = record.name;
+              if (unref(isSuccessRef)) createMessage.success('复制成功~');
+            },
+          },
+          [
+            h('div', { class: 'text-blue-400 truncate' }, record.alias),
+            h('div', { class: 'text-blue-400 truncate' }, record.name),
+          ]
+        ),
       ]);
     },
   },

@@ -15,6 +15,10 @@ import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import useCommonFun from '../hooks/useCommonFun';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 const { useByProductGetAttribute } = useCommonFun();
 export type TOption = {
@@ -109,13 +113,8 @@ export const formSchema: FormSchema[] = [
     field: 'organizationId',
     label: '所属组织',
     colProps: { span: 24 },
-    component: 'ApiTreeSelect',
+    component: 'OrgTreeSelect',
     componentProps: {
-      api: async () => {
-        const data = await screenLinkOrganizationGetApi();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
       onChange(value) {
         organizationId.value = value;
       },

 import { TaskTargetEnum, TaskTargetNameEnum, TaskTypeEnum, TaskTypeNameEnum } from '../../config';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { FormSchema, Rule, useComponentRegister } from '/@/components/Form';
 import {
   DevicePicker,
   validateDevicePicker,
@@ -211,14 +211,18 @@ export const formSchemas: FormSchema[] = [
     field: FormFieldsEnum.RPC_COMMAND,
     component: 'PollCommandInput',
     label: '自定义数据流',
-    rules: [{ required: true, message: '请输入自定义数据流' }],
-    dynamicRules: ({ model }) =>
-      model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT ? JSONEditorValidator() : [],
+    dynamicRules: ({ model }) => {
+      const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
+      return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
+        ? [...rules, ...JSONEditorValidator()]
+        : rules;
+    },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     valueField: 'value',
     changeEvent: 'update:value',
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
       const pushMode = Reflect.get(formModel, FormFieldsEnum.PUSH_WAY);
+      formActionType?.clearValidate(FormFieldsEnum.RPC_COMMAND);
       return {
         inputProps: {
           placeholder: '请输入自定义数据流',
@@ -232,7 +236,9 @@ export const formSchemas: FormSchema[] = [
     component: 'PollCommandInput',
     label: 'ModbusRTU轮询',
     rules: [{ required: true, message: '请输入Modbus RTU 轮询指令' }],
-    ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS_RTU,
+    ifShow: ({ model }) =>
+      model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS_RTU &&
+      model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.TCP,
     valueField: 'value',
     changeEvent: 'update:value',
     componentProps: () => {
@@ -345,6 +351,7 @@ export const formSchemas: FormSchema[] = [
     field: FormFieldsEnum.EXECUTE_TIME_INTERVAL,
     label: '间隔时间',
     component: 'InputNumber',
+    rules: [{ required: true, message: '请输入间隔时间', type: 'number' }],
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL,
     componentProps: ({ formModel }) => {
       const unit = formModel[FormFieldsEnum.POLL_UNIT];

@@ -78,7 +78,7 @@ export const formSchemas: FormSchema[] = [
               const result = await getDevicesByDeviceIds(data!);
               return result.data.map((item) => ({
                 label: item.alias || item.name,
-                value: 'tbDeviceId',
+                value: item.tbDeviceId,
               }));
             } else {
               const result = await getMeetTheConditionsDevice({
@@ -87,7 +87,7 @@ export const formSchemas: FormSchema[] = [
               });
               return result.map((item) => ({
                 label: item.alias || item.name,
-                value: 'tbDeviceId',
+                value: item.tbDeviceId,
               }));
             }
           } catch (error) {

-import { getOrganizationList } from '/@/api/system/system';
-import { FormSchema } from '/@/components/Form';
-import { copyTransFun } from '/@/utils/fnUtils';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 export enum ViewType {
   PRIVATE_VIEW = 'PRIVATE_VIEW',
   PUBLIC_VIEW = 'PUBLIC_VIEW',
 }
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 export const formSchema: FormSchema[] = [
   {
@@ -19,20 +19,9 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'organizationId',
-    component: 'ApiTreeSelect',
+    component: 'OrgTreeSelect',
     label: '组织',
     rules: [{ required: true, message: '组织为必填项' }],
-    componentProps() {
-      return {
-        placeholder: '请选择组织',
-        api: async () => {
-          const data = await getOrganizationList();
-          copyTransFun(data as any as any[]);
-          return data;
-        },
-        getPopupContainer: () => document.body,
-      };
-    },
   },
   {
     field: 'remark',