Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-front!1167

 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { DictEnum } from '/@/enums/dictEnum';
 import { DictEnum } from '/@/enums/dictEnum';
+import {
+  DataTypeEnum,
+  RegisterActionTypeEnum,
+  RegisterActionTypeNameEnum,
+  RegisterDataTypeEnum,
+} from '/@/enums/objectModelEnum';
 
 
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
   REGISTER_ADDRESS = 'registerAddress',
   REGISTER_ADDRESS = 'registerAddress',
   DATA_TYPE = 'dataType',
   DATA_TYPE = 'dataType',
   ACTION_TYPE = 'actionType',
   ACTION_TYPE = 'actionType',
   ZOOM_FACTOR = 'zoomFactor',
   ZOOM_FACTOR = 'zoomFactor',
+
+  OBJECT_MODEL_TYPE = 'objectModelType',
+}
+
+function getActionTypeByObjectModelType(dataType: DataTypeEnum) {
+  const list: Record<'label' | 'value', string>[] = [];
+  if (dataType === DataTypeEnum.BOOL) {
+    list.push({ label: RegisterActionTypeNameEnum.BOOL, value: RegisterActionTypeEnum.BOOL });
+  } else if (dataType === DataTypeEnum.NUMBER_INT) {
+    list.push({ label: RegisterActionTypeNameEnum.INT, value: RegisterActionTypeEnum.INT });
+  } else if (dataType === DataTypeEnum.NUMBER_DOUBLE) {
+    list.push({ label: RegisterActionTypeNameEnum.DOUBLE, value: RegisterActionTypeEnum.DOUBLE });
+  } else {
+    list.push(
+      ...Object.keys(RegisterActionTypeEnum).map((key) => ({
+        label: RegisterActionTypeNameEnum[key],
+        value: RegisterActionTypeEnum[key],
+      }))
+    );
+  }
+
+  return list;
 }
 }
 
 
 export const formSchemas: FormSchema[] = [
 export const formSchemas: FormSchema[] = [
   {
   {
+    field: FormFieldsEnum.OBJECT_MODEL_TYPE,
+    component: 'Input',
+    label: '物模型数据类型',
+    ifShow: false,
+  },
+  {
     field: FormFieldsEnum.REGISTER_ADDRESS,
     field: FormFieldsEnum.REGISTER_ADDRESS,
     component: 'RegisterAddressInput',
     component: 'RegisterAddressInput',
     label: '寄存器地址',
     label: '寄存器地址',
@@ -26,6 +60,7 @@ export const formSchemas: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '数据格式',
     label: '数据格式',
     rules: [{ message: '请选择数据格式', required: true }],
     rules: [{ message: '请选择数据格式', required: true }],
+    defaultValue: RegisterDataTypeEnum.UN_SHORT,
     componentProps: {
     componentProps: {
       api: findDictItemByCode,
       api: findDictItemByCode,
       params: {
       params: {
@@ -42,15 +77,13 @@ export const formSchemas: FormSchema[] = [
     component: 'Select',
     component: 'Select',
     label: '操作类型',
     label: '操作类型',
     rules: [{ message: '请选择操作类型', required: true }],
     rules: [{ message: '请选择操作类型', required: true }],
-    componentProps: {
-      options: [
-        { label: '05 写入单个线圈寄存器', value: '05' },
-        { label: '06 写入单个保持寄存器', value: '06' },
-        // { label: '0F 写入多个线圈状态', value: '0F' },
-        { label: '16 写入多个保持寄存器', value: '16' },
-      ],
-      placeholder: '请选择操作类型',
-      getPopupContainer: () => document.body,
+    componentProps: ({ formModel }) => {
+      const objectModelType = formModel[FormFieldsEnum.OBJECT_MODEL_TYPE];
+      return {
+        options: getActionTypeByObjectModelType(objectModelType),
+        placeholder: '请选择操作类型',
+        getPopupContainer: () => document.body,
+      };
     },
     },
   },
   },
   {
   {
@@ -59,6 +92,8 @@ export const formSchemas: FormSchema[] = [
     label: '缩放因子',
     label: '缩放因子',
     helpMessage: ['缩放因子不能为0,默认为1'],
     helpMessage: ['缩放因子不能为0,默认为1'],
     defaultValue: 1,
     defaultValue: 1,
+    ifShow: ({ model }) =>
+      ![DataTypeEnum.BOOL, DataTypeEnum.STRING].includes(model[FormFieldsEnum.OBJECT_MODEL_TYPE]),
     componentProps: {
     componentProps: {
       min: 1,
       min: 1,
       placeholder: '请输入缩放因子',
       placeholder: '请输入缩放因子',

@@ -22,13 +22,11 @@
 
 
   const emit = defineEmits(['update:value']);
   const emit = defineEmits(['update:value']);
 
 
-  const [
-    registerForm,
-    { setFieldsValue, getFieldsValue, setProps, validate, resetFields, updateSchema },
-  ] = useForm({
-    schemas: formSchemas,
-    showActionButtonGroup: false,
-  });
+  const [registerForm, { setFieldsValue, getFieldsValue, setProps, validate, resetFields }] =
+    useForm({
+      schemas: formSchemas,
+      showActionButtonGroup: false,
+    });
 
 
   const handleClick = async () => {
   const handleClick = async () => {
     show.value = true;
     show.value = true;
@@ -41,6 +39,7 @@
   const handleSubmit = async () => {
   const handleSubmit = async () => {
     await validate();
     await validate();
     const value = getFieldsValue();
     const value = getFieldsValue();
+    Reflect.deleteProperty(value, FormFieldsEnum.OBJECT_MODEL_TYPE);
     emit('update:value', value);
     emit('update:value', value);
     show.value = false;
     show.value = false;
   };
   };
@@ -48,12 +47,7 @@
   watch(show, async (value) => {
   watch(show, async (value) => {
     if (value) {
     if (value) {
       await nextTick();
       await nextTick();
-      updateSchema([
-        {
-          field: FormFieldsEnum.ZOOM_FACTOR,
-          ifShow: props.dataType == DataTypeEnum.BOOL ? false : true,
-        },
-      ]);
+      setFieldsValue({ [FormFieldsEnum.OBJECT_MODEL_TYPE]: props.dataType });
     }
     }
   });
   });
 
 

@@ -6,3 +6,23 @@ export enum DataTypeEnum {
   BOOL = 'BOOL',
   BOOL = 'BOOL',
   ENUM = 'ENUM',
   ENUM = 'ENUM',
 }
 }
+
+export enum RegisterDataTypeEnum {
+  UN_SHORT = 'unshort',
+}
+
+export enum RegisterDataTypeNameEnum {
+  UN_SHORT = '16位有符号',
+}
+
+export enum RegisterActionTypeEnum {
+  BOOL = '05',
+  INT = '06',
+  DOUBLE = '16',
+}
+
+export enum RegisterActionTypeNameEnum {
+  BOOL = '05写入单个线圈寄存器',
+  INT = '06写入单个保持寄存器',
+  DOUBLE = '16写入多个保持寄存器',
+}

@@ -91,7 +91,14 @@
   import CameraDrawer from './CameraDrawer.vue';
   import CameraDrawer from './CameraDrawer.vue';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager';
   import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager';
-  import { searchFormSchema, columns, AccessMode, PageMode, CameraPermission } from './config.data';
+  import {
+    searchFormSchema,
+    columns,
+    AccessMode,
+    PageMode,
+    CameraPermission,
+    VideoPlatformEnum,
+  } from './config.data';
   import VideoPreviewModal from './DialogPreviewVideo.vue';
   import VideoPreviewModal from './DialogPreviewVideo.vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
@@ -182,7 +189,12 @@
         handleSuccess();
         handleSuccess();
       };
       };
       const handleViewVideo = (record) => {
       const handleViewVideo = (record) => {
-        if (record.accessMode === AccessMode.ManuallyEnter) {
+        const { videoPlatformDTO } = record;
+        const { type } = videoPlatformDTO || {};
+        if (
+          record.accessMode === AccessMode.ManuallyEnter ||
+          (record.accessMode === AccessMode.Streaming && type === VideoPlatformEnum.FLUORITE)
+        ) {
           openModal(true, {
           openModal(true, {
             isUpdate: true,
             isUpdate: true,
             record,
             record,

@@ -21,6 +21,11 @@ export enum CameraPermission {
   DELETE = 'api:yt:video:delete',
   DELETE = 'api:yt:video:delete',
 }
 }
 
 
+export enum VideoPlatformEnum {
+  HAIKANG = 0,
+  FLUORITE = 1,
+}
+
 export enum AccessMode {
 export enum AccessMode {
   ManuallyEnter = 0,
   ManuallyEnter = 0,
   Streaming = 1,
   Streaming = 1,