Merge branch 'refs/heads/dev-2.19.0' into dev

src/components/video/Live.vue

@@ -280,8 +280,8 @@
 		console.log('选择摄像头', camera)
 		const { cameraIndexCode } = camera
 		getPreview({ cameraIndexCode, protocol: 'WS' }).then((resp) => {
-			if (!resp || !resp.data || !resp.data.url) return message.error('无法获取视频地址')
-			const url = resp.data.url
+			if (!resp || !resp.url) return message.error('无法获取视频地址')
+			const url = resp.url
 			const exists = Object.values(videoMap).findIndex((u) => u.url === url)
 			if (exists >= 0) {
 				return message.warning(`该视频已经在 ${exists + 1} 窗口播放`)

src/components/video/Replay.vue

@@ -181,8 +181,8 @@
 		}
 		const { cameraIndexCode } = camera
 		getPlaybackVideo({ cameraIndexCode }).then((resp) => {
-			if (!resp || !resp.data || !resp.data.url) return message.error('无法获取视频地址')
-			const url = resp.data.url
+			if (!resp || !resp.url) return message.error('无法获取视频地址')
+			const url = resp.url
 			if (url) {
 				const [realUrl, params] = url.split('?')
 				const [startTime, endTime] = date.value