Commit b812d26967cb0f094a80f20b1ed2644cc1337148
Merge branch 'fengtao' into 'main_dev'
perf: 优化视频配置,如果是萤石云则暂时隐藏云台控制 See merge request yunteng/thingskit-front!1166
Showing
2 changed files
with
19 additions
and
2 deletions
| @@ -91,7 +91,14 @@ | @@ -91,7 +91,14 @@ | ||
| 91 | import CameraDrawer from './CameraDrawer.vue'; | 91 | import CameraDrawer from './CameraDrawer.vue'; |
| 92 | import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree'; | 92 | import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree'; |
| 93 | import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager'; | 93 | import { cameraPage, deleteCameraManage } from '/@/api/camera/cameraManager'; |
| 94 | - import { searchFormSchema, columns, AccessMode, PageMode, CameraPermission } from './config.data'; | 94 | + import { |
| 95 | + searchFormSchema, | ||
| 96 | + columns, | ||
| 97 | + AccessMode, | ||
| 98 | + PageMode, | ||
| 99 | + CameraPermission, | ||
| 100 | + VideoPlatformEnum, | ||
| 101 | + } from './config.data'; | ||
| 95 | import VideoPreviewModal from './DialogPreviewVideo.vue'; | 102 | import VideoPreviewModal from './DialogPreviewVideo.vue'; |
| 96 | import { useModal } from '/@/components/Modal'; | 103 | import { useModal } from '/@/components/Modal'; |
| 97 | import { Authority } from '/@/components/Authority'; | 104 | import { Authority } from '/@/components/Authority'; |
| @@ -182,7 +189,12 @@ | @@ -182,7 +189,12 @@ | ||
| 182 | handleSuccess(); | 189 | handleSuccess(); |
| 183 | }; | 190 | }; |
| 184 | const handleViewVideo = (record) => { | 191 | const handleViewVideo = (record) => { |
| 185 | - if (record.accessMode === AccessMode.ManuallyEnter) { | 192 | + const { videoPlatformDTO } = record; |
| 193 | + const { type } = videoPlatformDTO || {}; | ||
| 194 | + if ( | ||
| 195 | + record.accessMode === AccessMode.ManuallyEnter || | ||
| 196 | + (record.accessMode === AccessMode.Streaming && type === VideoPlatformEnum.FLUORITE) | ||
| 197 | + ) { | ||
| 186 | openModal(true, { | 198 | openModal(true, { |
| 187 | isUpdate: true, | 199 | isUpdate: true, |
| 188 | record, | 200 | record, |
| @@ -21,6 +21,11 @@ export enum CameraPermission { | @@ -21,6 +21,11 @@ export enum CameraPermission { | ||
| 21 | DELETE = 'api:yt:video:delete', | 21 | DELETE = 'api:yt:video:delete', |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | +export enum VideoPlatformEnum { | ||
| 25 | + HAIKANG = 0, | ||
| 26 | + FLUORITE = 1, | ||
| 27 | +} | ||
| 28 | + | ||
| 24 | export enum AccessMode { | 29 | export enum AccessMode { |
| 25 | ManuallyEnter = 0, | 30 | ManuallyEnter = 0, |
| 26 | Streaming = 1, | 31 | Streaming = 1, |