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

src/api/previewPlayback/index.js

@@ -11,5 +11,5 @@ export const controlling = (data) => {
 }
 
 export const getPlayback = (data) => {
-	return request('/getPlayback', data, 'get')
+	return request('/getPlayback', data, 'post')
 }

src/components/video/Live.vue

@@ -193,8 +193,10 @@
 	}
 
 	const doControl = (command, action = 0, speed = 50, presetIndex = 10) => {
+		console.log('do control 2', command)
 		if (videoMap[currentWindowIndex]) {
 			const data = videoMap[currentWindowIndex]
+			const cameraId = data.cameraId
 			const c = findCameraByCameraId(cameraId)
 			if (c.cameraType !== '1') {
 				return message.warning('该操作必须是球形摄像机')
@@ -213,6 +215,7 @@
 	}
 
 	const doControl1 = (command) => {
+		console.log('do control 1', command)
 		doControl(command, 0)
 		setTimeout(() => {
 			doControl(command, 1)
@@ -282,7 +285,7 @@
 		getPreview({ cameraIndexCode, protocol: 'WS' }).then((resp) => {
 			if (!resp || !resp.url) return message.error('无法获取视频地址')
 			const url = resp.url
-			const exists = Object.values(videoMap).findIndex((u) => u.url === url)
+			const exists = Object.values(videoMap).findIndex((u) => u.cameraIndexCode === cameraIndexCode)
 			if (exists >= 0) {
 				return message.warning(`该视频已经在 ${exists + 1} 窗口播放`)
 			}

src/components/video/Replay.vue

@@ -207,7 +207,7 @@
 			endTime,
 			cameraIndexCode,
 			recordLocation: 1,
-			protocol: 'WSS'
+			protocol: 'wss'
 		})
 	}