From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
web_src/src/components/StreamProxyList.vue | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
old mode 100644
new mode 100755
index f0cb777..eb1f7d8
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -22,8 +22,8 @@
{{scope.row.url}}
</el-tag>
<el-tag size="medium" v-if="scope.row.type != 'default'">
- <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="scope.row.src_url" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
- {{scope.row.src_url}}
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="scope.row.srcUrl" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ {{scope.row.srcUrl}}
</el-tag>
</div>
</template>
@@ -58,25 +58,25 @@
<el-table-column label="闊抽" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.enable_audio">宸插惎鐢�</el-tag>
- <el-tag size="medium" type="info" v-if="!scope.row.enable_audio">鏈惎鐢�</el-tag>
+ <el-tag size="medium" v-if="scope.row.enableAudio">宸插惎鐢�</el-tag>
+ <el-tag size="medium" type="info" v-if="!scope.row.enableAudio">鏈惎鐢�</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="褰曞埗" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.enable_mp4">宸插惎鐢�</el-tag>
- <el-tag size="medium" type="info" v-if="!scope.row.enable_mp4">鏈惎鐢�</el-tag>
+ <el-tag size="medium" v-if="scope.row.enableMp4">宸插惎鐢�</el-tag>
+ <el-tag size="medium" type="info" v-if="!scope.row.enableMp4">鏈惎鐢�</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="鏃犱汉瑙傜湅" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.enable_remove_none_reader">绉婚櫎</el-tag>
- <el-tag size="medium" v-if="scope.row.enable_disable_none_reader">鍋滅敤</el-tag>
- <el-tag size="medium" type="info" v-if="!scope.row.enable_remove_none_reader && !scope.row.enable_disable_none_reader">涓嶅仛澶勭悊</el-tag>
+ <el-tag size="medium" v-if="scope.row.enableRemoveNoneReader">绉婚櫎</el-tag>
+ <el-tag size="medium" v-if="scope.row.enableDisableNoneReader">鍋滅敤</el-tag>
+ <el-tag size="medium" type="info" v-if="!scope.row.enableRemoveNoneReader && !scope.row.enableDisableNoneReader">涓嶅仛澶勭悊</el-tag>
</div>
</template>
</el-table-column>
@@ -91,6 +91,8 @@
<el-button size="medium" icon="el-icon-check" type="text" :loading="scope.row.startBtnLoading" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
<el-divider v-if="!scope.row.enable" direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-cloudy" type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -167,7 +169,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`./api/proxy/list`,
+ url:`/api/proxy/list`,
params: {
page: that.currentPage,
count: that.count
@@ -190,14 +192,14 @@
addOnvif: function(){
this.$axios({
method: 'get',
- url:`./api/onvif/search?timeout=3000`,
+ url:`/api/onvif/search?timeout=3000`,
}).then((res) =>{
if (res.data.code === 0 ){
if (res.data.data.length > 0) {
this.$refs.onvifEdit.openDialog(res.data.data, (url)=>{
if (url != null) {
this.$refs.onvifEdit.close();
- this.$refs.streamProxyEdit.openDialog({type: "default", url: url, src_url: url}, this.initData())
+ this.$refs.streamProxyEdit.openDialog({type: "default", url: url, srcUrl: url}, this.initData())
}
})
}else {
@@ -218,7 +220,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`./api/push/getPlayUrl`,
+ url:`/api/push/getPlayUrl`,
params: {
app: row.app,
stream: row.stream,
@@ -243,27 +245,38 @@
});
},
+ queryCloudRecords: function (row) {
+
+ this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
+ },
deleteStreamProxy: function(row){
let that = this;
- that.$axios({
- method:"delete",
- url:"./api/proxy/del",
- params:{
- app: row.app,
- stream: row.stream
- }
- }).then((res)=>{
- that.initData()
- }).catch(function (error) {
- console.log(error);
- });
+ this.$confirm('纭畾鍒犻櫎姝や唬鐞嗗悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ that.$axios({
+ method:"delete",
+ url:"/api/proxy/del",
+ params:{
+ app: row.app,
+ stream: row.stream
+ }
+ }).then((res)=>{
+ that.initData()
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }).catch(() => {
+ });
},
start: function(row){
this.stopUpdateList()
this.$set(row, 'startBtnLoading', true)
this.$axios({
method: 'get',
- url:`./api/proxy/start`,
+ url:`/api/proxy/start`,
params: {
app: row.app,
stream: row.stream
@@ -295,7 +308,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`./api/proxy/stop`,
+ url:`/api/proxy/stop`,
params: {
app: row.app,
stream: row.stream
--
Gitblit v1.8.0