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 | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue index c78d699..20c42ef 100644 --- a/web_src/src/components/dialog/chooseChannelForStream.vue +++ b/web_src/src/components/dialog/chooseChannelForStream.vue @@ -27,7 +27,6 @@ <script> export default { name: 'chooseChannelFoStream', - props: {}, computed: { // getPlayerShared: function () { // return { @@ -37,7 +36,7 @@ // }; // } }, - props: ['platformId'], + props: ['platformId', 'updateChoosedCallback'], created() { this.initData(); }, @@ -49,7 +48,8 @@ channelType: "", online: "", choosed: "", - currentPage: 0, + catalogId: null, + currentPage: 1, count: 10, total: 0, eventEnanle: false @@ -60,7 +60,7 @@ platformId(newData, oldData){ console.log(newData) this.initData() - + }, }, methods: { @@ -104,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++) { @@ -112,7 +112,7 @@ delData.push(that.gbChoosechannel[key]) } } - + }else{ var oldKeys = Object.keys(that.gbChoosechannel); if (oldKeys.length > 0) { @@ -131,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); }); @@ -145,10 +147,12 @@ 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); }); @@ -191,7 +195,7 @@ that.$refs.gbStreamsTable.toggleRowSelection(row, true); chooseGBS.push(row) that.gbChoosechannel[row.app+ "_" + row.stream] = row; - + } } that.eventEnanle = true; @@ -207,6 +211,10 @@ handleGBSelectionChange: function() { this.initData(); }, + catalogIdChange: function(id) { + this.catalogId = id; + console.log("鐩存挱閫氶亾閫夋嫨妯″潡鏀跺埌锛� " + id) + }, } }; </script> -- Gitblit v1.8.0