Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

This commit is contained in:
648540858 2023-06-10 00:33:00 +08:00
commit 415c13cf72

View File

@ -58,25 +58,25 @@
<el-table-column label="音频" min-width="120" > <el-table-column label="音频" min-width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<el-tag size="medium" 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.enable_audio">未启用</el-tag> <el-tag size="medium" type="info" v-if="!scope.row.enableAudio">未启用</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="录制" min-width="120" > <el-table-column label="录制" min-width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<el-tag size="medium" 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.enable_mp4">未启用</el-tag> <el-tag size="medium" type="info" v-if="!scope.row.enableMp4">未启用</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="无人观看" min-width="160" > <el-table-column label="无人观看" min-width="160" >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <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.enableRemoveNoneReader">移除</el-tag>
<el-tag size="medium" v-if="scope.row.enable_disable_none_reader">停用</el-tag> <el-tag size="medium" v-if="scope.row.enableDisableNoneReader">停用</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" type="info" v-if="!scope.row.enableRemoveNoneReader && !scope.row.enableDisableNoneReader">不做处理</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -245,6 +245,11 @@
}, },
deleteStreamProxy: function(row){ deleteStreamProxy: function(row){
let that = this; let that = this;
this.$confirm('确定删除此代理吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.$axios({ that.$axios({
method:"delete", method:"delete",
url:"/api/proxy/del", url:"/api/proxy/del",
@ -256,6 +261,8 @@
that.initData() that.initData()
}).catch(function (error) { }).catch(function (error) {
console.log(error); console.log(error);
});
}).catch(() => {
}); });
}, },
start: function(row){ start: function(row){