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

src/components/video/Live.vue

@@ -212,6 +212,13 @@
 		}
 	}
 
+	const doControl1 = (command) => {
+		doControl(command, 0)
+		setTimeout(() => {
+			doControl(command, 1)
+		}, 2000)
+	}
+
 	const startTrack = () => {
 		doControl('START_TRACK', 0)
 	}
@@ -366,10 +373,14 @@
 							>
 								<div class="control-row">
 									<template v-for="item in list">
-										<a-button v-if="item.code !== 'GOTO_PRESET'" :key="item.code" class="small-btn"
+										<a-button
+											v-if="item.code !== 'GOTO_PRESET'"
+											:key="item.code"
+											class="small-btn"
+											@click="doControl1(item.code)"
 											>{{ item.label }}
 										</a-button>
-										<a-button v-else class="small-btn">
+										<a-button v-else class="small-btn" @click="doControl(item.code)">
 											<template #icon>
 												<UndoOutlined />
 											</template>
@@ -380,12 +391,12 @@
 						</div>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn"> + 聚焦 </a-button>
-						<a-button type="primary" class="btn">- 聚焦</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="doControl1('FOCUS_NEAR')"> + 聚焦 </a-button>
+						<a-button type="primary" class="btn" @click="doControl1('FOCUS_FAR')">- 聚焦</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn"> + 调焦 </a-button>
-						<a-button type="primary" class="btn">- 调焦</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="doControl1('ZOOM_IN')"> + 调焦 </a-button>
+						<a-button type="primary" class="btn" @click="doControl1('ZOOM_OUT')">- 调焦</a-button>
 					</div>
 					<!--					<div class="row">-->
 					<!--						<a-button type="primary" class="mr-5 btn"> 录像开始 </a-button>-->