From dc20ccfce84d46f86209309ea70ba81d0360e070 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 一月 2022 15:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannelForStream.vue | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 514ac3e..341c22f 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);
});
@@ -149,6 +151,7 @@
}
}).then((res)=>{
console.log("绉婚櫎鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(this.catalogId)
}).catch(function (error) {
console.log(error);
});
@@ -162,16 +165,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;
@@ -189,7 +194,7 @@
that.$refs.gbStreamsTable.toggleRowSelection(row, true);
chooseGBS.push(row)
that.gbChoosechannel[row.app+ "_" + row.stream] = row;
-
+
}
}
that.eventEnanle = true;
@@ -205,6 +210,10 @@
handleGBSelectionChange: function() {
this.initData();
},
+ catalogIdChange: function(id) {
+ this.catalogId = id;
+ console.log("鐩存挱閫氶亾閫夋嫨妯″潡鏀跺埌锛� " + id)
+ },
}
};
</script>
--
Gitblit v1.8.0