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

src/components/video/Live.vue

@@ -380,11 +380,11 @@
 						<a-button type="primary" class="btn">中止轮巡</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn" @click="captureOne">窗口抓图</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="captureOne(null)">窗口抓图</a-button>
 						<a-button type="primary" class="btn" @click="stopPlay">窗口关闭</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn" @click="captureAll">全部抓图</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="captureAll()">全部抓图</a-button>
 						<a-button type="primary" class="btn" @click="stopAllPlay">全部关闭</a-button>
 					</div>
 					<div v-if="hasPerm(['controlCloud'])" class="flex flex-col">

src/utils/systemUtils.js

@@ -186,16 +186,10 @@ export const getQueryParams = (name) => {
 }
 
 export const downloadLink = (url) => {
-	const iframe = document.createElement('iframe')
-	iframe.style.display = 'none' // 防止影响页面
-	iframe.style.height = 0 // 防止影响页面
-	iframe.src = url
-	document.body.appendChild(iframe) // 这一行必须，iframe挂在到dom树上才会发请求
-	// 5分钟之后删除（onload方法对于下载链接不起作用，就先抠脚一下吧）
-	setTimeout(
-		function () {
-			iframe.remove()
-		},
-		5 * 60 * 1000
-	)
+	const a = document.createElement('a')
+	a.href = url
+	a.download = fileName || 'download'
+	document.body.appendChild(a)
+	a.click()
+	document.body.removeChild(a)
 }