Преглед на файлове

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

Lita-Tako преди 4 месеца
родител
ревизия
50612c67fb
променени са 2 файла, в които са добавени 8 реда и са изтрити 7 реда
  1. 4 4
      src/components/video/Live.vue
  2. 4 3
      src/components/video/Replay.vue

+ 4 - 4
src/components/video/Live.vue

@@ -387,10 +387,10 @@
387 387
 						<a-button type="primary" class="mr-5 btn"> + 调焦 </a-button>
388 388
 						<a-button type="primary" class="btn">- 调焦</a-button>
389 389
 					</div>
390
-					<div class="row">
391
-						<a-button type="primary" class="mr-5 btn"> 录像开始 </a-button>
392
-						<a-button type="primary" class="btn">录像结束</a-button>
393
-					</div>
390
+					<!--					<div class="row">-->
391
+					<!--						<a-button type="primary" class="mr-5 btn"> 录像开始 </a-button>-->
392
+					<!--						<a-button type="primary" class="btn">录像结束</a-button>-->
393
+					<!--					</div>-->
394 394
 				</a-tab-pane>
395 395
 			</a-tabs>
396 396
 		</div>

+ 4 - 3
src/components/video/Replay.vue

@@ -183,8 +183,9 @@
183 183
 		getPlaybackVideo({ cameraIndexCode }).then((resp) => {
184 184
 			const { url } = resp
185 185
 			if (url) {
186
-				const { startTime, endTime } = date.value
187
-				player.value.JS_Play(url, { playURL: url, mode }, 0, startTime, endTime).then(
186
+				const [realUrl, params] = url.split('?')
187
+				const [startTime, endTime] = date.value
188
+				player.value.JS_Play(realUrl, { playURL: realUrl, mode }, 0, startTime, endTime).then(
188 189
 					() => {
189 190
 						console.log('playbackStart success')
190 191
 					},
@@ -286,7 +287,7 @@
286 287
 		<div class="control w-[20%] h-full">
287 288
 			<a-tabs v-model:activeKey="activeKey">
288 289
 				<a-tab-pane key="1" tab="摄像头列表">
289
-					回放日期 <a-range-picker v-model:value="date" value-format="YYYY-MM-DDTHH:mm:ssZ" show-time />
290
+					回放日期 <a-range-picker v-model:value="date" value-format="YYYY-MM-DDTHH:mm:ss.000+08:00" show-time />
290 291
 					<div class="mt-5">
291 292
 						<a-tree :tree-data="cameraListData" @select="cameraSelect" class="w-full">
292 293
 							<template #title="{ title, key }">