Browse Source

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

Lita-Tako 4 months ago
parent
commit
0a174fbeb6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/components/video/Live.vue
  2. 1 1
      src/components/video/Replay.vue

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

@@ -257,7 +257,7 @@
257
 				}
257
 				}
258
 			]
258
 			]
259
 			list.forEach((d) => {
259
 			list.forEach((d) => {
260
-				const type = d.cameraType
260
+				const type = d.live
261
 				const temp = {
261
 				const temp = {
262
 					title: d.cameraName,
262
 					title: d.cameraName,
263
 					key: d.cameraId,
263
 					key: d.cameraId,

+ 1 - 1
src/components/video/Replay.vue

@@ -152,7 +152,7 @@
152
 				}
152
 				}
153
 			]
153
 			]
154
 			list.forEach((d) => {
154
 			list.forEach((d) => {
155
-				const type = d.cameraType
155
+				const type = d.live
156
 				const temp = {
156
 				const temp = {
157
 					title: d.cameraName,
157
 					title: d.cameraName,
158
 					key: d.cameraId,
158
 					key: d.cameraId,