Merge branch 'dev_by_ft' into 'main_dev'

fix: 修改视频配置，点击编辑回显，部分回显失败

See merge request yunteng/thingskit-front!1201

@@ -4,14 +4,11 @@ import { defHttp } from '/@/utils/http/axios';
 import { isString } from '/@/utils/is';
 import { isString } from '/@/utils/is';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 
 
-// 获取设备配置
-export const getDeviceProfile = ({ deviceType, transportType }) => {
+// 获取设备配置，很多地方使用，不能修改这里
+export const getDeviceProfile = (deviceType?: string) => {
   return defHttp.get<DeviceProfileModel[]>({
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
     url: '/device_profile/me/list',
-    params: {
-      deviceType: isString(deviceType) ? deviceType : undefined,
-      transportType: isString(transportType) ? transportType : undefined,
-    },
+    params: { deviceType: isString(deviceType) ? deviceType : undefined },
   });
   });
 };
 };
 
 
@@ -62,3 +59,14 @@ export const getDeviceAttribute = (entityId: string) => {
     }
     }
   );
   );
 };
 };
+
+//获取设备配置，新增传协议类型
+export const getDeviceProfileByTransportType = ({ deviceType, transportType }) => {
+  return defHttp.get<DeviceProfileModel[]>({
+    url: '/device_profile/me/list',
+    params: {
+      deviceType: isString(deviceType) ? deviceType : undefined,
+      transportType: isString(transportType) ? transportType : undefined,
+    },
+  });
+};

@@ -131,6 +131,7 @@
           await setFieldsValue({
           await setFieldsValue({
             videoType: record.videoPlatformDTO?.type,
             videoType: record.videoPlatformDTO?.type,
             ...params,
             ...params,
+            ...(record?.params || {}),
           });
           });
         } else {
         } else {
           editId.value = '';
           editId.value = '';

-import { getDeviceProfile } from '/@/api/alarm/position';
+import { getDeviceProfileByTransportType } from '/@/api/alarm/position';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 
 
 enum FormFieldsEnum {
 enum FormFieldsEnum {
@@ -40,7 +40,7 @@ export const formSchemas: FormSchema[] = [
       const { getFieldsValue } = formActionType;
       const { getFieldsValue } = formActionType;
       const { transportType } = getFieldsValue();
       const { transportType } = getFieldsValue();
       return {
       return {
-        api: getDeviceProfile,
+        api: getDeviceProfileByTransportType,
         params: {
         params: {
           deviceType: formModel[FormFieldsEnum.DEVICE_TYPE],
           deviceType: formModel[FormFieldsEnum.DEVICE_TYPE],
           transportType,
           transportType,