diff --git a/src/api/media/channel.ts b/src/api/media/channel.ts index 06b80f65..a24cd0e4 100644 --- a/src/api/media/channel.ts +++ b/src/api/media/channel.ts @@ -67,4 +67,7 @@ export default { // 播放云端回放 playbackStart: (recordId: string) => server.get(`/media/record/${recordId}.mp4`), + + // 设备预置位相关接口 + opFunction: (deviceId: string, functionId: string, data?: any) => server.post(`/device/invoked/${deviceId}/function/${functionId}`, data) } \ No newline at end of file diff --git a/src/components/Player/mediaTool.less b/src/components/Player/mediaTool.less index 68edb215..8428448f 100644 --- a/src/components/Player/mediaTool.less +++ b/src/components/Player/mediaTool.less @@ -44,7 +44,7 @@ justify-content: center; width: 45%; height: 45%; - font-size: 30px; + // font-size: 30px; background-color: #fff; border-radius: 50%; transform: translate(-50%, -50%) rotateZ(-45deg); diff --git a/src/components/Player/mediaTool.vue b/src/components/Player/mediaTool.vue index 83f0b315..b206a16b 100644 --- a/src/components/Player/mediaTool.vue +++ b/src/components/Player/mediaTool.vue @@ -39,7 +39,7 @@
- +
diff --git a/src/router/index.ts b/src/router/index.ts index 09f14d0e..0f4ff104 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,5 @@ import { createRouter, createWebHashHistory } from 'vue-router' -import menus, { AccountCenterBindPath, InitHomePath, InitLicense, LoginPath, OauthPath } from './menu' +import menus, { AccountCenterBindPath, InitHomePath, InitLicense, LoginPath, OauthPath, VideoSharePath } from './menu' import { cleanToken, getToken } from '@/utils/comm' import { useUserInfo } from '@/store/userInfo' import { useSystem } from '@/store/system' @@ -15,7 +15,7 @@ const router = createRouter({ }) const filterPath = [ InitHomePath ] -const noTokenPath = [ AccountCenterBindPath, OauthPath, InitLicense ] +const noTokenPath = [ AccountCenterBindPath, OauthPath, InitLicense, VideoSharePath ] router.beforeEach((to, from, next) => { // TODO 切换路由取消请求 diff --git a/src/router/menu.ts b/src/router/menu.ts index 7f7c7614..34605154 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -5,6 +5,7 @@ export const InitLicense = '/init-license' export const NotificationSubscriptionCode = 'message-subscribe' export const NotificationRecordCode = 'account/NotificationRecord' export const OauthPath = '/oauth' +export const VideoSharePath = '/media/device/Share' export const AccountMenu = { path: '/account', @@ -86,5 +87,9 @@ export default [ }, component: () => import('@/views/oauth/WeChat.vue') }, + { + path: VideoSharePath, + component: () => import('@/views/media/Device/Channel/Share/index.vue') + }, AccountMenu ] \ No newline at end of file diff --git a/src/views/media/Device/Channel/Live/Preset.vue b/src/views/media/Device/Channel/Live/Preset.vue new file mode 100644 index 00000000..338ca1dd --- /dev/null +++ b/src/views/media/Device/Channel/Live/Preset.vue @@ -0,0 +1,200 @@ + + + \ No newline at end of file diff --git a/src/views/media/Device/Channel/Live/Share.vue b/src/views/media/Device/Channel/Live/Share.vue new file mode 100644 index 00000000..416e1537 --- /dev/null +++ b/src/views/media/Device/Channel/Live/Share.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/views/media/Device/Channel/Live/index.less b/src/views/media/Device/Channel/Live/index.less index e8e0b3f6..b2e2221e 100644 --- a/src/views/media/Device/Channel/Live/index.less +++ b/src/views/media/Device/Channel/Live/index.less @@ -1,22 +1,21 @@ .media-live { display: flex; - .live-player-tools { - flex-basis: 230px; + // .live-player-tools { + // flex-basis: 300px; - .direction-item { - font-size: 30px !important; - } + // .direction-item { + // font-size: 30px !important; + // } - .zoom-item { - font-size: 20px !important; - } - } + // .zoom-item { + // font-size: 20px !important; + // } + // } .media-live-video { position: relative; - flex-grow: 1; - width: 0; + flex: 1; .media-tool { position: absolute; @@ -50,9 +49,20 @@ } } } + + .media-live-actions { + width: 300px; + margin-left: 10px; + + .actions-tool { + padding: 0 40px 5px 40px; + } + } } .media-live-tool { display: flex; - margin-top: 24px; + margin-bottom: 24px; + justify-content: space-between; + align-items: center; } diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue index 27d292e1..176940af 100644 --- a/src/views/media/Device/Channel/Live/index.vue +++ b/src/views/media/Device/Channel/Live/index.vue @@ -3,49 +3,82 @@ + +
+ + MP4 + FLV + HLS + +
+ 分享视频 +
+
-
-
- diff --git a/src/views/media/Device/Channel/Share/index.vue b/src/views/media/Device/Channel/Share/index.vue new file mode 100644 index 00000000..11d43227 --- /dev/null +++ b/src/views/media/Device/Channel/Share/index.vue @@ -0,0 +1,30 @@ + + + \ No newline at end of file