Commit 52f9c295f90188d3346b9c129a00e817ab7f14e4

Authored by 648540858
2 parents 446f729e d93947c6

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

web_src/src/components/StreamProxyList.vue
... ... @@ -58,25 +58,25 @@
58 58 <el-table-column label="音频" min-width="120" >
59 59 <template slot-scope="scope">
60 60 <div slot="reference" class="name-wrapper">
61   - <el-tag size="medium" v-if="scope.row.enable_audio">已启用</el-tag>
62   - <el-tag size="medium" type="info" v-if="!scope.row.enable_audio">未启用</el-tag>
  61 + <el-tag size="medium" v-if="scope.row.enableAudio">已启用</el-tag>
  62 + <el-tag size="medium" type="info" v-if="!scope.row.enableAudio">未启用</el-tag>
63 63 </div>
64 64 </template>
65 65 </el-table-column>
66 66 <el-table-column label="录制" min-width="120" >
67 67 <template slot-scope="scope">
68 68 <div slot="reference" class="name-wrapper">
69   - <el-tag size="medium" v-if="scope.row.enable_mp4">已启用</el-tag>
70   - <el-tag size="medium" type="info" v-if="!scope.row.enable_mp4">未启用</el-tag>
  69 + <el-tag size="medium" v-if="scope.row.enableMp4">已启用</el-tag>
  70 + <el-tag size="medium" type="info" v-if="!scope.row.enableMp4">未启用</el-tag>
71 71 </div>
72 72 </template>
73 73 </el-table-column>
74 74 <el-table-column label="无人观看" min-width="160" >
75 75 <template slot-scope="scope">
76 76 <div slot="reference" class="name-wrapper">
77   - <el-tag size="medium" v-if="scope.row.enable_remove_none_reader">移除</el-tag>
78   - <el-tag size="medium" v-if="scope.row.enable_disable_none_reader">停用</el-tag>
79   - <el-tag size="medium" type="info" v-if="!scope.row.enable_remove_none_reader && !scope.row.enable_disable_none_reader">不做处理</el-tag>
  77 + <el-tag size="medium" v-if="scope.row.enableRemoveNoneReader">移除</el-tag>
  78 + <el-tag size="medium" v-if="scope.row.enableDisableNoneReader">停用</el-tag>
  79 + <el-tag size="medium" type="info" v-if="!scope.row.enableRemoveNoneReader && !scope.row.enableDisableNoneReader">不做处理</el-tag>
80 80 </div>
81 81 </template>
82 82 </el-table-column>
... ... @@ -245,18 +245,25 @@
245 245 },
246 246 deleteStreamProxy: function(row){
247 247 let that = this;
248   - that.$axios({
249   - method:"delete",
250   - url:"/api/proxy/del",
251   - params:{
252   - app: row.app,
253   - stream: row.stream
254   - }
255   - }).then((res)=>{
256   - that.initData()
257   - }).catch(function (error) {
258   - console.log(error);
259   - });
  248 + this.$confirm('确定删除此代理吗?', '提示', {
  249 + confirmButtonText: '确定',
  250 + cancelButtonText: '取消',
  251 + type: 'warning'
  252 + }).then(() => {
  253 + that.$axios({
  254 + method:"delete",
  255 + url:"/api/proxy/del",
  256 + params:{
  257 + app: row.app,
  258 + stream: row.stream
  259 + }
  260 + }).then((res)=>{
  261 + that.initData()
  262 + }).catch(function (error) {
  263 + console.log(error);
  264 + });
  265 + }).catch(() => {
  266 + });
260 267 },
261 268 start: function(row){
262 269 this.stopUpdateList()
... ...