From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannelForStream.vue | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 0824cbb..20c42ef 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -10,8 +10,6 @@
</el-table-column>
<el-table-column prop="gbId" label="鍥芥爣缂栫爜" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="streamType" label="娴佹潵婧�" align="center" show-overflow-tooltip>
- </el-table-column>
<el-table-column label="娴佹潵婧�" width="100" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
@@ -29,7 +27,6 @@
<script>
export default {
name: 'chooseChannelFoStream',
- props: {},
computed: {
// getPlayerShared: function () {
// return {
@@ -39,7 +36,7 @@
// };
// }
},
- props: ['platformId'],
+ props: ['platformId', 'updateChoosedCallback'],
created() {
this.initData();
},
@@ -51,7 +48,8 @@
channelType: "",
online: "",
choosed: "",
- currentPage: 0,
+ catalogId: null,
+ currentPage: 1,
count: 10,
total: 0,
eventEnanle: false
@@ -62,7 +60,7 @@
platformId(newData, oldData){
console.log(newData)
this.initData()
-
+
},
},
methods: {
@@ -106,7 +104,7 @@
delete that.gbChoosechannel[key]
}
}
-
+
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
for (let i = 0; i < oldKeys.length; i++) {
@@ -114,7 +112,7 @@
delData.push(that.gbChoosechannel[key])
}
}
-
+
}else{
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
@@ -133,10 +131,12 @@
url:"/api/gbStream/add",
data:{
platformId: that.platformId,
+ catalogId: that.catalogId,
gbStreams: addData,
}
}).then((res)=>{
console.log("淇濆瓨鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(this.catalogId)
}).catch(function (error) {
console.log(error);
});
@@ -144,16 +144,19 @@
if (Object.keys(delData).length >0) {
console.log(delData)
that.$axios({
- method:"post",
+ method:"delete",
url:"/api/gbStream/del",
data:{
+ platformId: that.platformId,
gbStreams: delData,
}
}).then((res)=>{
console.log("绉婚櫎鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(this.catalogId)
}).catch(function (error) {
console.log(error);
});
+
}
},
@@ -163,16 +166,18 @@
getChannelList: function () {
let that = this;
- this.$axios.get(`/api/gbStream/list`, {
- params: {
- page: that.currentPage,
- count: that.count,
- query: that.searchSrt,
- online: that.online,
- choosed: that.choosed,
- platformId: that.platformId,
- channelType: that.channelType
- }
+ this.$axios({
+ method: 'get',
+ url:`/api/gbStream/list`,
+ params: {
+ page: that.currentPage,
+ count: that.count,
+ query: that.searchSrt,
+ online: that.online,
+ choosed: that.choosed,
+ platformId: that.platformId,
+ channelType: that.channelType
+ }
})
.then(function (res) {
that.total = res.data.total;
@@ -190,7 +195,7 @@
that.$refs.gbStreamsTable.toggleRowSelection(row, true);
chooseGBS.push(row)
that.gbChoosechannel[row.app+ "_" + row.stream] = row;
-
+
}
}
that.eventEnanle = true;
@@ -206,6 +211,10 @@
handleGBSelectionChange: function() {
this.initData();
},
+ catalogIdChange: function(id) {
+ this.catalogId = id;
+ console.log("鐩存挱閫氶亾閫夋嫨妯″潡鏀跺埌锛� " + id)
+ },
}
};
</script>
--
Gitblit v1.8.0