Merge branch 'ww' into 'main'

fix： BUG in teambition

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

+import { DeviceProfileModel } from '../../device/model/deviceModel';
 import { HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 
 // 获取设备配置
 export const getDeviceProfile = () => {
-  return defHttp.get({
+  return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
   });
 };

@@ -166,9 +166,10 @@ export const getShareBoardComponentInfo = (params: { boardId: string; tenantId:
  * @param params
  * @returns
  */
-export const getAllDeviceByOrg = (params: string) => {
+export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
   return defHttp.get<MasterDeviceList[]>({
-    url: `${DeviceUrl.GET_DEVICE}/${params}`,
+    url: `${DeviceUrl.GET_DEVICE}/${organizationId}`,
+    params: { deviceProfileId },
   });
 };
 

@@ -78,6 +78,7 @@ export interface DataSource {
   gatewayDevice: boolean;
   componentInfo: ComponentInfo;
   deviceName: string;
+  deviceProfileId: string;
 
   // front usage
   uuid?: string;

@@ -25,6 +25,7 @@ export interface StructJSON {
   identifier?: string;
   remark?: string;
   dataType?: DataType;
+  serviceCommand?: string;
 }
 
 export interface FunctionJson {

@@ -65,7 +65,7 @@ export const releaseModel = (deviceProfileId: string) => {
 
 export const getModelServices = (params: { deviceProfileId: string }) => {
   const { deviceProfileId } = params;
-  return defHttp.get({
+  return defHttp.get<ModelOfMatterParams[]>({
     url: `${ModelOfMatter.GET_MODEL_SERVICE}/${deviceProfileId}`,
   });
 };

@@ -56,7 +56,7 @@
 
   const handleBeforeUpload = (file: File) => {
     if (file.size > props.maxSize) {
-      createMessage.warning(`文件大小超过${Math.floor(props.maxSize / 1024)}mb`);
+      createMessage.warning(`文件大小超过${Math.floor(props.maxSize / 1024 / 1024)}mb`);
       return false;
     }
     handleUpload(file);

-import { h } from 'vue';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema } from '/@/components/Table';
@@ -22,7 +21,6 @@ const validateValueRange = (_rule, value: Record<'min' | 'max', number>, _callba
 };
 
 const validateJSON = (_rule, value: ModelOfMatterParams[], _callback) => {
-  console.log('validate json', value);
   if (value.length) {
     return Promise.resolve();
   }
@@ -141,10 +139,15 @@ export const formSchemas: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       return {
         placeholder: '请选择单位',
-        api: findDictItemByCode,
+        api: async (params) => {
+          const list = await findDictItemByCode(params);
+          list.map((item) => (item.itemText = `${item.itemText} / ${item.itemValue}`));
+          return list;
+        },
         params: {
           dictCode: 'attribute_unit',
         },
+        labelInValue: true,
         labelField: 'itemText',
         valueField: 'itemValue',
         onChange(_, record: Record<'label' | 'value', string>) {
@@ -165,14 +168,6 @@ export const formSchemas: FormSchema[] = [
     ifShow: ({ values }) =>
       values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_INT ||
       values[FormField.TYPE] === DateTypeEnum.IS_NUMBER_DOUBLE,
-    renderComponentContent: () => {
-      return {
-        option: (params: Record<'label' | 'value', string>) => {
-          const { label, value } = params;
-          return h('span', `${label} / ${value}`);
-        },
-      };
-    },
   },
   {
     field: FormField.BOOL_CLOSE,

@@ -34,7 +34,6 @@
     let { width = 300, height = 150 } = unref(getOptions);
     width = isNumber(width) ? (`${width}px` as unknown as number) : width;
     height = isNumber(height) ? (`${height}px` as unknown as number) : height;
-    console.log({ getOptions });
     return { width, height } as CSSProperties;
   });
 

+import { onUnmounted, ref } from 'vue';
+
+interface ScriptOptions {
+  src: string;
+}
+
+export function useAsyncScript(opts: ScriptOptions) {
+  const isLoading = ref(false);
+  const error = ref(false);
+  const success = ref(false);
+  let script: HTMLScriptElement;
+
+  const toPromise = () => {
+    return new Promise((resolve, reject) => {
+      script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.onload = function () {
+        isLoading.value = false;
+        success.value = true;
+        error.value = false;
+        resolve('');
+      };
+
+      script.onerror = function (err) {
+        isLoading.value = false;
+        success.value = false;
+        error.value = true;
+        reject(err);
+      };
+
+      script.src = opts.src;
+      document.head.appendChild(script);
+    });
+  };
+
+  onUnmounted(() => {
+    script && script.remove();
+  });
+
+  return {
+    isLoading,
+    error,
+    success,
+    toPromise,
+  };
+}

@@ -62,6 +62,7 @@ export function useECharts(
     }
     nextTick(() => {
       useTimeoutFn(() => {
+        console.log(chartInstance);
         if (!chartInstance) {
           initCharts(getDarkMode.value as 'default');
 
@@ -70,6 +71,7 @@ export function useECharts(
         clear && chartInstance?.clear();
 
         chartInstance?.setOption(unref(getOptions));
+        chartInstance = null;
       }, 30);
     });
   }

@@ -120,7 +120,6 @@
         const index = unref(cameraList).findIndex((item) => item.id === record.id);
         if (~index) unref(cameraList)[index].isTransform = true;
       }
-      console.log(unref(cameraList));
     }
   };
 

@@ -65,7 +65,6 @@
           setDrawerProps({ confirmLoading: true });
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
-          console.log(values);
           await saveOrUpdateConfigurationCenter(values, unref(isUpdate));
           closeDrawer();
           emit('success');

@@ -29,7 +29,7 @@
   import { cloneDeep } from 'lodash';
   import { usePermission } from '/@/hooks/web/usePermission';
 
-  const listColumn = ref(4);
+  const listColumn = ref(5);
 
   const { createMessage } = useMessage();
 
@@ -209,7 +209,7 @@
               <template #cover>
                 <div class="h-full w-full !flex justify-center items-center text-center">
                   <img
-                    class="w-36 h-36"
+                    class="w-full h-36"
                     alt="example"
                     :src="item.thumbnail || configurationSrc"
                     @click="handlePreview(item)"

@@ -57,7 +57,7 @@
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 550px; width: 100%"></div>
+      <div ref="mapWrapRef" style="height: 550px; width: 100%"></div>
     </div>
   </div>
 </template>
@@ -65,7 +65,7 @@
   import { defineComponent, ref, unref, nextTick } from 'vue';
   import { Image, Tooltip } from 'ant-design-vue';
   import { descSchema } from '../../config/detail.config';
-  import { useScript } from '/@/hooks/web/useScript';
+  import { useAsyncScript } from '/@/hooks/web/useAsyncScript';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
@@ -77,6 +77,7 @@
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 
   import wz from '/@/assets/images/wz.png';
+  import { useAsyncQueue } from '../../../localtion/useAsyncQueue';
   export default defineComponent({
     components: {
       Image,
@@ -101,13 +102,30 @@
       });
 
       // 地图
-      const wrapRef = ref<HTMLDivElement | null>(null);
-      const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
+      const mapWrapRef = ref<HTMLDivElement>();
 
-      async function initMap(longitude, latitude, address) {
-        await toPromise();
+      const { executeFlag, setTask } = useAsyncQueue();
+      const { toPromise } = useAsyncScript({ src: BAI_DU_MAP_URL });
+
+      async function initMap(longitude: number, latitude: number, address: string) {
+        if (!(window as any).BMap) {
+          setTask(() => markerMap(longitude, latitude, address));
+          let interval: Nullable<NodeJS.Timer> = setInterval(() => {
+            if ((window as any).BMap) {
+              executeFlag.value = true;
+              clearInterval(interval!);
+              interval = null;
+            }
+          }, 300);
+          await toPromise();
+          return;
+        }
+        markerMap(longitude, latitude, address);
+      }
+
+      async function markerMap(longitude: number, latitude: number, address: string) {
         await nextTick();
-        const wrapEl = unref(wrapRef);
+        const wrapEl = unref(mapWrapRef);
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
@@ -132,6 +150,7 @@
         map.enableScrollWheelZoom(true);
         map.addOverlay(marker);
       }
+
       const { createMessage } = useMessage();
       const { clipboardRef } = useCopyToClipboard();
       const copyTbDeviceId = () => {
@@ -166,7 +185,7 @@
       const remoteConnectiondGateway = () => {};
 
       return {
-        wrapRef,
+        mapWrapRef,
         copyTbDeviceId,
         copyDeviceToken,
         initMap,

@@ -6,6 +6,7 @@ import { HistoryData } from '/@/api/alarm/position/model';
 import { getDeviceAttributes } from '/@/api/dataBoard';
 import { DeviceAttributeRecord } from '/@/api/dataBoard/model';
 import { dateUtil } from '/@/utils/dateUtil';
+import { isArray } from '/@/utils/is';
 import { QueryWay } from '/@/views/report/config/config.data';
 import { SchemaFiled } from '/@/views/visual/board/detail/config/historyTrend.config';
 import { DEFAULT_DATE_FORMAT } from '/@/views/visual/board/detail/config/util';
@@ -24,7 +25,8 @@ export function useHistoryData() {
   const getDeviceAttribute = async (record: DeviceOption) => {
     try {
       const { deviceProfileId } = record;
-      deviceAttrs.value = (await getDeviceAttributes({ deviceProfileId })) || [];
+      const list = (await getDeviceAttributes({ deviceProfileId })) || [];
+      deviceAttrs.value = isArray(list) ? list : [];
     } catch (error) {
       throw error;
     }

@@ -22,6 +22,7 @@ export function useAsyncQueue() {
     if (executeFlag.value) {
       queue.forEach((item) => item());
       executeFlag.value = false;
+      clearTask();
     }
   });
 

@@ -33,7 +33,9 @@
                 </Button>
               </Authority>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
-              <Button v-if="isShowBtn" type="primary" @click="handleImportModel">导入物模型</Button>
+              <Button v-if="false && isShowBtn" type="primary" @click="handleImportModel"
+                >导入物模型</Button
+              >
             </div>
             <div class="flex gap-2">
               <Authority :value="ModelOfMatterPermission.RELEASE">

@@ -25,7 +25,7 @@
         >
           <TabPane :key="FunctionType.PROPERTIES" tab="属性" />
           <TabPane :key="FunctionType.SERVICE" :disabled="isTCPGatewaySubDevice" tab="服务" />
-          <TabPane :key="FunctionType.EVENTS" tab="事件" :disabled="isTCPGatewaySubDevice" />
+          <!-- <TabPane :key="FunctionType.EVENTS" tab="事件" :disabled=" isTCPGatewaySubDevice" /> -->
         </Tabs>
         <Attribute v-if="activeKey === FunctionType.PROPERTIES" ref="AttrRef" />
         <Service

@@ -11,7 +11,7 @@
       <Tabs type="card" v-model:active-key="activeKey" @change="handleSwitchTsl">
         <Tabs.TabPane :key="FunctionType.PROPERTIES" tab="属性" />
         <Tabs.TabPane :key="FunctionType.SERVICE" tab="服务" />
-        <Tabs.TabPane :key="FunctionType.EVENTS" tab="事件" />
+        <!-- <Tabs.TabPane :key="FunctionType.EVENTS" tab="事件" /> -->
         <template #tabBarExtraContent>
           <Button @click="handlePremitter">
             <template #icon>

@@ -27,7 +27,7 @@
     const _value = (event.target as HTMLInputElement).checked;
     emit('update:value', _value);
     emit('change', _value);
-    sendCommand(props.value?.slaveDeviceId || props.value?.deviceId, _value);
+    sendCommand(props.value!, _value);
   };
 </script>
 

@@ -32,8 +32,7 @@
 
   const { sendCommand } = useSendCommand();
   const handleChange = (value: boolean) => {
-    console.log(props.value);
-    sendCommand(props.value.slaveDeviceId! || props.value.deviceId!, value);
+    sendCommand(props.value, value);
   };
 
   watchEffect(() => {

@@ -22,7 +22,7 @@
     const _value = (event.target as HTMLInputElement).checked;
     emit('update:value', _value);
     emit('change', _value);
-    sendCommand(props.value?.slaveDeviceId || props.value?.deviceId, _value);
+    sendCommand(props.value!, _value);
   };
 
   const getRadio = computed(() => {

@@ -13,6 +13,7 @@ export interface ControlComponentValue {
   deviceId?: string;
   fontColor?: string;
   slaveDeviceId?: string;
+  deviceProfileId?: string;
 }
 
 export const ControlComponentDefaultConfig: ControlComponentValue = {
@@ -31,6 +32,7 @@ export const transformControlConfig = (
       ...dataSourceRecord.componentInfo,
       attribute: dataSourceRecord.attribute,
       attributeRename: dataSourceRecord.attributeRename,
+      deviceProfileId: dataSourceRecord.deviceProfileId,
       deviceId: dataSourceRecord.deviceId,
       slaveDeviceId: dataSourceRecord.slaveDeviceId,
     } as ControlComponentValue,

+import { ControlComponentValue } from './control.config';
+import { getDeviceProfile } from '/@/api/alarm/position';
 import { sendCommandOneway } from '/@/api/dataBoard';
+import { getModelServices } from '/@/api/device/modelOfMatter';
 import { useMessage } from '/@/hooks/web/useMessage';
+import { isString } from '/@/utils/is';
 
 const { createMessage } = useMessage();
 export function useSendCommand() {
-  const sendCommand = async (deviceId: string, value: any) => {
+  const sendCommand = async (record: ControlComponentValue, value: any) => {
+    const { deviceId, deviceProfileId, attribute } = record;
     if (!deviceId) return;
     try {
+      const list = await getDeviceProfile();
+      const deviceProfile = list.find((item) => item.id === deviceProfileId);
+      if (!deviceProfile) return;
+      let params: string | Recordable = {
+        [attribute!]: Number(value),
+      };
+      if (deviceProfile.transportType === 'TCP') {
+        const serviceList = await getModelServices({ deviceProfileId: deviceProfileId! });
+        const record = serviceList.find((item) => item.identifier === attribute);
+        const sendCommand = record?.functionJson.inputData?.at(0)?.serviceCommand || '';
+        params = isString(sendCommand) ? sendCommand : JSON.stringify(sendCommand);
+      }
       await sendCommandOneway({
         deviceId,
         value: {
-          params: Number(value),
+          params: params,
           persistent: true,
           additionalInfo: {
             cmdType: 'API',

@@ -5,9 +5,9 @@
     SettingOutlined,
     SwapOutlined,
   } from '@ant-design/icons-vue';
-  import { Tooltip, Button } from 'ant-design-vue';
+  import { Tooltip, Button, Alert } from 'ant-design-vue';
   import { FormActionType, useForm } from '/@/components/Form';
-  import { basicSchema, DataSourceField } from '../config/basicConfiguration';
+  import { basicSchema, DataSourceField, isMapComponent } from '../config/basicConfiguration';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   import { ref, shallowReactive, unref, nextTick, watch, computed, onMounted } from 'vue';
   import VisualOptionsModal from './VisualOptionsModal.vue';
@@ -22,6 +22,7 @@
   import { useSortable } from '/@/hooks/web/useSortable';
   import { cloneDeep } from 'lodash-es';
   import { frontComponentMap } from '../../components/help';
+  import { isControlComponent } from '../config/basicConfiguration';
 
   type DataSourceFormEL = { [key: string]: Nullable<FormActionType> };
 
@@ -250,6 +251,14 @@
     inited = true;
   }
 
+  const isControlCmp = computed(() => {
+    return isControlComponent(props.frontId as FrontComponent);
+  });
+
+  const isMapCmp = computed(() => {
+    return isMapComponent(props.frontId as FrontComponent);
+  });
+
   onMounted(() => handleSort());
 
   defineExpose({
@@ -264,7 +273,25 @@
     <div class="w-3/4">
       <BasicForm @register="basicRegister" class="w-full" />
     </div>
+    <Alert type="info" show-icon v-if="isControlCmp">
+      <template #description>
+        <div>
+          控制组件数据源为TCP产品,则其控制命令下发为TCP产品 物模型=>服务，且不具备状态显示功能.
+        </div>
+        <div>
+          控制组件数据源为非TCP产品,则其控制命令下发为产品 物模型=>属性，且具备状态显示功能.
+        </div>
+      </template>
+    </Alert>
+    <Alert type="info" show-icon v-if="isMapCmp">
+      <template #description>
+        <div>
+          地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为维度，否则地图组件不能正常显示。
+        </div>
+      </template>
+    </Alert>
     <h3 class="w-24 flex-shrink-0 text-right pr-2 my-4">选择数据源</h3>
+
     <section ref="formListEl">
       <div v-for="item in dataSource" :data-id="item.id" :key="item.id" class="flex bg-light-50">
         <div class="w-24 text-right flex right justify-end"> 选择设备 </div>

@@ -4,6 +4,8 @@ import { FormSchema } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { DeviceAttributeParams, MasterDeviceList } from '/@/api/dataBoard/model';
 import { FrontComponent } from '../../const/const';
+import { getDeviceProfile } from '/@/api/alarm/position';
+import { getModelServices } from '/@/api/device/modelOfMatter';
 
 export enum BasicConfigField {
   NAME = 'name',
@@ -18,13 +20,22 @@ const getDeviceAttribute = async (params: DeviceAttributeParams) => {
   return [];
 };
 
+const getDeviceService = async (deviceProfileId: string) => {
+  try {
+    const data = await getModelServices({ deviceProfileId });
+    if (data)
+      return data.map((item) => ({ ...item, label: item.functionName, value: item.identifier }));
+  } catch (error) {}
+  return [];
+};
+
 export enum DataSourceField {
   IS_GATEWAY_DEVICE = 'gatewayDevice',
+  TRANSPORT_TYPE = 'transportType',
   ORIGINATION_ID = 'organizationId',
   DEVICE_ID = 'deviceId',
   SLAVE_DEVICE_ID = 'slaveDeviceId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
-  SLAVE_DEVICE_PROFILE_ID = 'slaveDeviceProfileId',
   ATTRIBUTE = 'attribute',
   ATTRIBUTE_RENAME = 'attributeRename',
   DEVICE_NAME = 'deviceName',
@@ -33,16 +44,25 @@ export enum DataSourceField {
   LATITUDE_ATTRIBUTE = 'latitudeAttribute',
 }
 
-const isControlComponent = (frontId: FrontComponent) => {
+export const isControlComponent = (frontId: FrontComponent) => {
   const list = [
     FrontComponent.CONTROL_COMPONENT_SLIDING_SWITCH,
     FrontComponent.CONTROL_COMPONENT_SWITCH_WITH_ICON,
     FrontComponent.CONTROL_COMPONENT_TOGGLE_SWITCH,
   ];
-  if (list.includes(frontId)) {
-    return true;
-  }
-  return false;
+  return list.includes(frontId);
+};
+
+export const isMapComponent = (frontId: FrontComponent) => {
+  const list = [
+    FrontComponent.MAP_COMPONENT_TRACK_HISTORY,
+    FrontComponent.MAP_COMPONENT_TRACK_REAL,
+  ];
+  return list.includes(frontId);
+};
+
+const isTcpProfile = (transportType: string) => {
+  return transportType === 'TCP';
 };
 
 export const basicSchema: FormSchema[] = [
@@ -81,6 +101,45 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       show: false,
     },
     {
+      field: DataSourceField.TRANSPORT_TYPE,
+      component: 'Input',
+      label: '设备配置类型',
+      show: false,
+    },
+    {
+      field: DataSourceField.DEVICE_PROFILE_ID,
+      component: 'ApiSelect',
+      label: '产品',
+      colProps: { span: 8 },
+      rules: [{ required: true, message: '产品为必填项' }],
+      componentProps: ({ formActionType, formModel }) => {
+        const { setFieldsValue } = formActionType;
+        const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        return {
+          api: async () => {
+            const list = await getDeviceProfile();
+            if (deviceProfileId) {
+              const record = list.find((item) => item.id === deviceProfileId);
+              setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
+            }
+            return list;
+          },
+          labelField: 'name',
+          valueField: 'id',
+          onChange: (_, option: Record<'transportType', string>) => {
+            console.log(option);
+            setFieldsValue({
+              [DataSourceField.DEVICE_ID]: null,
+              [DataSourceField.ATTRIBUTE]: null,
+              [DataSourceField.SLAVE_DEVICE_ID]: null,
+              [DataSourceField.IS_GATEWAY_DEVICE]: false,
+              [DataSourceField.TRANSPORT_TYPE]: option.transportType,
+            });
+          },
+        };
+      },
+    },
+    {
       field: DataSourceField.ORIGINATION_ID,
       component: 'ApiTreeSelect',
       label: '组织',
@@ -101,8 +160,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
               [DataSourceField.ATTRIBUTE]: null,
               [DataSourceField.SLAVE_DEVICE_ID]: null,
               [DataSourceField.IS_GATEWAY_DEVICE]: false,
-              [DataSourceField.DEVICE_PROFILE_ID]: null,
-              [DataSourceField.SLAVE_DEVICE_PROFILE_ID]: null,
             });
           },
           getPopupContainer: () => document.body,
@@ -124,16 +181,13 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps({ formModel, formActionType }) {
         const { setFieldsValue } = formActionType;
         const organizationId = formModel[DataSourceField.ORIGINATION_ID];
-        const deviceId = formModel[DataSourceField.DEVICE_ID];
+        const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+
         return {
           api: async () => {
             if (organizationId) {
               try {
-                const data = await getAllDeviceByOrg(organizationId);
-                if (deviceId) {
-                  const record = data.find((item) => item.id === deviceId);
-                  setFieldsValue({ [DataSourceField.DEVICE_PROFILE_ID]: record?.deviceProfileId });
-                }
+                const data = await getAllDeviceByOrg(organizationId, deviceProfileId);
                 if (data)
                   return data.map((item) => ({
                     ...item,
@@ -150,9 +204,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
             setFieldsValue({
               [DataSourceField.ATTRIBUTE]: null,
               [DataSourceField.IS_GATEWAY_DEVICE]: record?.deviceType === 'GATEWAY',
-              [DataSourceField.DEVICE_PROFILE_ID]: record?.deviceProfileId,
               [DataSourceField.SLAVE_DEVICE_ID]: null,
-              [DataSourceField.SLAVE_DEVICE_PROFILE_ID]: null,
               [DataSourceField.DEVICE_NAME]: record?.label,
             });
           },
@@ -162,19 +214,18 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       },
     },
     {
-      field: DataSourceField.SLAVE_DEVICE_PROFILE_ID,
-      component: 'Input',
-      label: '',
-      show: false,
-    },
-    {
       field: DataSourceField.SLAVE_DEVICE_ID,
       label: '网关子设备',
       component: 'ApiSelect',
       colProps: { span: 8 },
       rules: [{ required: true, message: '网关子设备为必填项' }],
+      show: false,
       ifShow({ model }) {
-        return model[DataSourceField.IS_GATEWAY_DEVICE];
+        const transportType = model[DataSourceField.TRANSPORT_TYPE];
+        return (
+          !(isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) &&
+          model[DataSourceField.IS_GATEWAY_DEVICE]
+        );
       },
       dynamicRules({ model }) {
         return [
@@ -186,16 +237,12 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
         const organizationId = formModel[DataSourceField.ORIGINATION_ID];
         const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];
         const deviceId = formModel[DataSourceField.DEVICE_ID];
-        const slaveDeviceId = formModel[DataSourceField.SLAVE_DEVICE_ID];
+
         return {
           api: async () => {
             if (organizationId && isGatewayDevice) {
               try {
                 const data = await getGatewaySlaveDevice({ organizationId, masterId: deviceId });
-                if (slaveDeviceId) {
-                  const record = data.find((item) => item.id === slaveDeviceId);
-                  setFieldsValue({ [DataSourceField.DEVICE_PROFILE_ID]: record?.deviceProfileId });
-                }
                 if (data)
                   return data.map((item) => ({
                     ...item,
@@ -210,7 +257,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
           onChange(_value, record: MasterDeviceList) {
             setFieldsValue({
               [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.SLAVE_DEVICE_PROFILE_ID]: record.deviceProfileId,
               [DataSourceField.DEVICE_NAME]: record?.label,
             });
           },
@@ -226,33 +272,30 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       colProps: { span: 8 },
       rules: [{ required: true, message: '属性为必填项' }],
       componentProps({ formModel }) {
-        const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];
-        const deviceId = formModel[DataSourceField.DEVICE_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
-        const slaveDeviceId = formModel[DataSourceField.SLAVE_DEVICE_ID];
-        const slaveDeviceProfileId = formModel[DataSourceField.SLAVE_DEVICE_PROFILE_ID];
+        const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
 
         return {
           api: async () => {
-            if (deviceId) {
-              try {
-                if (isGatewayDevice && slaveDeviceId && slaveDeviceProfileId) {
-                  return await getDeviceAttribute({
-                    deviceProfileId: slaveDeviceProfileId,
-                    dataType: isControlComponent(frontId!) ? 'BOOL' : undefined,
-                  });
-                }
-                if (!isGatewayDevice && deviceProfileId) {
-                  return await getDeviceAttribute({
-                    deviceProfileId,
-                    dataType: isControlComponent(frontId!) ? 'BOOL' : undefined,
-                  });
-                }
-              } catch (error) {}
-            }
+            try {
+              if (isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) {
+                return await getDeviceService(deviceProfileId);
+              }
+
+              if (deviceProfileId) {
+                return await getDeviceAttribute({
+                  deviceProfileId,
+                  dataType: isControlComponent(frontId!) ? 'BOOL' : undefined,
+                });
+              }
+            } catch (error) {}
+
             return [];
           },
-          placeholder: '请选择属性',
+          placeholder:
+            isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)
+              ? '请选择服务'
+              : '请选择属性',
           getPopupContainer: () => document.body,
         };
       },