Merge branch 'feat/camera-manage' into 'main_dev'

Feat/camera manage

See merge request yunteng/thingskit-front!1143

@@ -40,7 +40,7 @@
 <script lang="ts">
   import { defineComponent, ref, computed, unref, nextTick, onMounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from './config.data';
+  import { AccessMode, formSchema, VideoPlatformEnum } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { createOrEditCameraManage } from '/@/api/camera/cameraManager';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -106,14 +106,23 @@
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
           await nextTick();
+          const { record } = data || {};
           editId.value = data.record.id;
+
           if (data.record.avatar) {
-            setFieldsValue({
-              avatar: [{ uid: buildUUID(), name: 'name', url: data.record.avatar } as FileItem],
+            Object.assign(record, {
+              avatar: [{ uid: buildUUID(), name: 'name', url: record.avatar } as FileItem],
             });
           }
-          const { ...params } = data.record;
-          await setFieldsValue({ ...params, videoType: params.videoPlatformDTO?.type });
+
+          if (
+            record?.accessMode === AccessMode.Streaming &&
+            record.videoPlatformDTO?.type === VideoPlatformEnum.FLUORITE
+          ) {
+            Object.assign(record, { articulation: record.streamType });
+          }
+
+          setFieldsValue({ ...record, videoType: record.videoPlatformDTO?.type });
         } else {
           editId.value = '';
         }
@@ -138,6 +147,14 @@
           }
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
+
+          if (
+            values?.accessMode === AccessMode.Streaming &&
+            values.videoType === VideoPlatformEnum.FLUORITE
+          ) {
+            values.streamType = values.articulation;
+          }
+
           await createOrEditCameraManage(values);
           closeDrawer();
           emit('success');

@@ -48,6 +48,14 @@ export enum MediaType {
   M3U8 = 'm3u8',
 }
 
+export enum ArticulationEnumType {
+  HIGH_DEFINITION = 1,
+  SMOOTH = 2,
+}
+export enum ArticulationEnumNameType {
+  HIGH_DEFINITION = '高清',
+  SMOOTH = '流畅',
+}
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
@@ -103,10 +111,12 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-const videTypeNum = {
-  SCI: 0,
-  FLUORITE: 1,
-};
+export enum VideoPlatformEnum {
+  // 海康
+  SCI = 0,
+  // 萤石云
+  FLUORITE = 1,
+}
 
 // 弹框配置项
 export const formSchema: QFormSchema[] = [
@@ -228,7 +238,7 @@ export const formSchema: QFormSchema[] = [
     label: '流媒体平台',
     component: 'ApiRadioGroup',
     required: true,
-    defaultValue: videTypeNum.SCI,
+    defaultValue: VideoPlatformEnum.SCI,
     ifShow: ({ values }) => values.accessMode === AccessMode.Streaming,
     componentProps: {
       api: async (params) => {
@@ -261,7 +271,8 @@ export const formSchema: QFormSchema[] = [
     defaultValue: StreamType.MASTER,
     ifShow({ values }) {
       return (
-        values.accessMode === AccessMode.Streaming && values.videoType !== videTypeNum.FLUORITE
+        values.accessMode === AccessMode.Streaming &&
+        values.videoType !== VideoPlatformEnum.FLUORITE
       );
     },
     componentProps: {
@@ -275,23 +286,43 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
+    field: 'articulation',
+    label: '清晰度',
+    component: 'RadioGroup',
+    defaultValue: ArticulationEnumType.HIGH_DEFINITION,
+    ifShow: ({ model }) =>
+      model.accessMode === AccessMode.Streaming && model.videoType === VideoPlatformEnum.FLUORITE,
+    componentProps: () => {
+      return {
+        options: [
+          {
+            label: ArticulationEnumNameType.HIGH_DEFINITION,
+            value: ArticulationEnumType.HIGH_DEFINITION,
+          },
+          {
+            label: ArticulationEnumNameType.SMOOTH,
+            value: ArticulationEnumType.SMOOTH,
+          },
+        ],
+      };
+    },
+  },
+  {
     field: 'playProtocol',
     label: '播放协议',
     component: 'RadioGroup',
-    defaultValue: PlayProtocol.HTTP,
+    defaultValue: PlayProtocol.HTTPS,
     ifShow({ values }) {
       return (
-        values.accessMode === AccessMode.Streaming && values.videoType !== videTypeNum.FLUORITE
+        values.accessMode === AccessMode.Streaming &&
+        values.videoType !== VideoPlatformEnum.FLUORITE
       );
     },
     helpMessage: ['平台使用https的hls协议,需联系海康开放平台专家支持。'],
     componentProps: {
       placeholder: '请选择播放协议',
-      defaultValue: PlayProtocol.HTTP,
-      options: [
-        { label: 'http', value: PlayProtocol.HTTP },
-        { label: 'https', value: PlayProtocol.HTTPS },
-      ],
+      defaultValue: PlayProtocol.HTTPS,
+      options: [{ label: 'https', value: PlayProtocol.HTTPS }],
     },
   },
   {
@@ -301,7 +332,8 @@ export const formSchema: QFormSchema[] = [
     rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
     ifShow({ values }) {
       return (
-        values.accessMode === AccessMode.Streaming && values.videoType !== videTypeNum.FLUORITE
+        values.accessMode === AccessMode.Streaming &&
+        values.videoType !== VideoPlatformEnum.FLUORITE
       );
     },
     componentProps: {
@@ -315,7 +347,8 @@ export const formSchema: QFormSchema[] = [
     rules: [...CameraVideoUrl, { required: true, message: '摄像头编号是必填项' }],
     ifShow({ values }) {
       return (
-        values.accessMode === AccessMode.Streaming && values.videoType === videTypeNum.FLUORITE
+        values.accessMode === AccessMode.Streaming &&
+        values.videoType === VideoPlatformEnum.FLUORITE
       );
     },
     componentProps: {

-import { PlayProtocol } from '../manage/config.data';
+import { PlayProtocol, VideoPlatformEnum } from '../manage/config.data';
 import type { StreamingMediaModel } from '/@/api/camera/model/cameraModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { DictEnum } from '/@/enums/dictEnum';
@@ -75,11 +75,6 @@ export const formSchema: FormSchema[] = [
   },
 ];
 
-const videTypeNum = {
-  ISC: 0,
-  Fluorite: 1,
-};
-
 export const formDetailSchema: FormSchema[] = [
   {
     label: '平台类型',
@@ -102,15 +97,12 @@ export const formDetailSchema: FormSchema[] = [
     label: '部署环境',
     field: 'ssl',
     component: 'RadioGroup',
-    ifShow: ({ model }) => model.type !== videTypeNum.Fluorite,
+    ifShow: ({ model }) => model.type !== VideoPlatformEnum.FLUORITE,
     rules: [{ required: true, message: '流媒体部署环境为必填项', type: 'number' }],
-    defaultValue: PlayProtocol.HTTP,
+    defaultValue: PlayProtocol.HTTPS,
     componentProps: {
       defaultValue: PlayProtocol.HTTP,
-      options: [
-        { label: 'http', value: PlayProtocol.HTTP },
-        { label: 'https', value: PlayProtocol.HTTPS },
-      ],
+      options: [{ label: 'https', value: PlayProtocol.HTTPS }],
     },
   },
   {