Commit 558f294038422a26237487731bc5a486445a5936
Merge branch 'fix/video-manange' into 'main_dev'
fix: 修复视频配置播放协议可设置为http && 流媒体配置删除播放协议 See merge request yunteng/thingskit-front!1145
Showing
2 changed files
with
8 additions
and
9 deletions
@@ -311,7 +311,7 @@ export const formSchema: QFormSchema[] = [ | @@ -311,7 +311,7 @@ export const formSchema: QFormSchema[] = [ | ||
311 | field: 'playProtocol', | 311 | field: 'playProtocol', |
312 | label: '播放协议', | 312 | label: '播放协议', |
313 | component: 'RadioGroup', | 313 | component: 'RadioGroup', |
314 | - defaultValue: PlayProtocol.HTTPS, | 314 | + defaultValue: PlayProtocol.HTTP, |
315 | ifShow({ values }) { | 315 | ifShow({ values }) { |
316 | return ( | 316 | return ( |
317 | values.accessMode === AccessMode.Streaming && | 317 | values.accessMode === AccessMode.Streaming && |
@@ -321,8 +321,11 @@ export const formSchema: QFormSchema[] = [ | @@ -321,8 +321,11 @@ export const formSchema: QFormSchema[] = [ | ||
321 | helpMessage: ['平台使用https的hls协议,需联系海康开放平台专家支持。'], | 321 | helpMessage: ['平台使用https的hls协议,需联系海康开放平台专家支持。'], |
322 | componentProps: { | 322 | componentProps: { |
323 | placeholder: '请选择播放协议', | 323 | placeholder: '请选择播放协议', |
324 | - defaultValue: PlayProtocol.HTTPS, | ||
325 | - options: [{ label: 'https', value: PlayProtocol.HTTPS }], | 324 | + defaultValue: PlayProtocol.HTTP, |
325 | + options: [ | ||
326 | + { label: 'http', value: PlayProtocol.HTTP }, | ||
327 | + { label: 'https', value: PlayProtocol.HTTPS }, | ||
328 | + ], | ||
326 | }, | 329 | }, |
327 | }, | 330 | }, |
328 | { | 331 | { |
1 | -import { PlayProtocol, VideoPlatformEnum } from '../manage/config.data'; | 1 | +import { PlayProtocol } from '../manage/config.data'; |
2 | import type { StreamingMediaModel } from '/@/api/camera/model/cameraModel'; | 2 | import type { StreamingMediaModel } from '/@/api/camera/model/cameraModel'; |
3 | import { findDictItemByCode } from '/@/api/system/dict'; | 3 | import { findDictItemByCode } from '/@/api/system/dict'; |
4 | import { DictEnum } from '/@/enums/dictEnum'; | 4 | import { DictEnum } from '/@/enums/dictEnum'; |
@@ -97,13 +97,9 @@ export const formDetailSchema: FormSchema[] = [ | @@ -97,13 +97,9 @@ export const formDetailSchema: FormSchema[] = [ | ||
97 | label: '部署环境', | 97 | label: '部署环境', |
98 | field: 'ssl', | 98 | field: 'ssl', |
99 | component: 'RadioGroup', | 99 | component: 'RadioGroup', |
100 | - ifShow: ({ model }) => model.type !== VideoPlatformEnum.FLUORITE, | 100 | + ifShow: false, |
101 | rules: [{ required: true, message: '流媒体部署环境为必填项', type: 'number' }], | 101 | rules: [{ required: true, message: '流媒体部署环境为必填项', type: 'number' }], |
102 | defaultValue: PlayProtocol.HTTPS, | 102 | defaultValue: PlayProtocol.HTTPS, |
103 | - componentProps: { | ||
104 | - defaultValue: PlayProtocol.HTTP, | ||
105 | - options: [{ label: 'https', value: PlayProtocol.HTTPS }], | ||
106 | - }, | ||
107 | }, | 103 | }, |
108 | { | 104 | { |
109 | label: '平台地址', | 105 | label: '平台地址', |