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/chooseChannel.vue | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 87fc62e..85755e8 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -1,25 +1,40 @@
<template>
<div id="chooseChannel" v-loading="isLoging">
- <el-dialog title="閫夋嫨閫氶亾" v-if="showDialog" top="2rem" width="70%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
- <el-tabs v-model="tabActiveName" >
+ <el-dialog title="閫夋嫨閫氶亾" v-if="showDialog" top="2rem" width="90%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
+ <el-row>
+ <el-col :span="10">
+ <el-tabs v-model="catalogTabActiveName" >
+ <el-tab-pane label="鐩綍缁撴瀯" name="catalog">
+ <el-container>
+ <el-main style="background-color: #FFF;">
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange"></chooseChannelForCatalog>
+ </el-main>
+ </el-container>
+ </el-tab-pane>
+ </el-tabs>
+
+ </el-col>
+ <el-col :span="14">
+ <el-tabs v-model="tabActiveName" @tab-click="tabClick">
<el-tab-pane label="鍥芥爣閫氶亾" name="gbChannel">
- <el-container>
- <el-main style="background-color: #FFF;">
- <chooseChannelForGb :platformId=platformId ></chooseChannelForGb>
- </el-main>
- </el-container>
-
-
+ <el-container>
+ <el-main style="background-color: #FFF;">
+ <chooseChannelForGb ref="chooseChannelForGb" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelForGb>
+ </el-main>
+ </el-container>
</el-tab-pane>
<el-tab-pane label="鐩存挱娴侀�氶亾" name="streamchannel">
- <el-container>
- <el-main style="background-color: #FFF;">
- <chooseChannelFoStream :platformId=platformId ></chooseChannelFoStream>
- </el-main>
- </el-container>
+ <el-container>
+ <el-main style="background-color: #FFF;">
+ <chooseChannelFoStream ref="chooseChannelFoStream" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
+ </el-main>
+ </el-container>
</el-tab-pane>
- </el-tabs>
+ </el-tabs>
+ </el-col>
+ </el-row>
+
</el-dialog>
</div>
</template>
@@ -27,12 +42,14 @@
<script>
import chooseChannelForGb from '../dialog/chooseChannelForGb.vue'
import chooseChannelFoStream from '../dialog/chooseChannelForStream.vue'
+import chooseChannelForCatalog from '../dialog/chooseChannelForCatalog.vue'
export default {
name: 'chooseChannel',
props: {},
components: {
chooseChannelForGb,
chooseChannelFoStream,
+ chooseChannelForCatalog,
},
computed: {
// getPlayerShared: function () {
@@ -47,19 +64,34 @@
return {
isLoging: false,
tabActiveName: "gbChannel",
+ catalogTabActiveName: "catalog",
platformId: "",
- isLoging: false,
+ catalogId: "",
+ platformName: "",
+ defaultCatalogId: "",
showDialog: false,
chooseData: {}
};
},
methods: {
- openDialog: function (platformId, closeCallback) {
- console.log(platformId)
+ openDialog(platformId, platformName, defaultCatalogId, closeCallback) {
this.platformId = platformId
+ this.platformName = platformName
+ this.defaultCatalogId = defaultCatalogId
this.showDialog = true
this.closeCallback = closeCallback
+ },
+ tabClick (tab, event){
+ console.log(tab.label)
+ if (tab.label === "gbChannel") {
+ this.$refs.chooseChannelForGb.catalogIdChange(this.catalogId);
+ this.$refs.chooseChannelForGb.initData();
+ }else {
+ this.$refs.chooseChannelFoStream.catalogIdChange(this.catalogId);
+ this.$refs.chooseChannelFoStream.initData();
+ }
+
},
close: function() {
this.closeCallback()
@@ -88,6 +120,21 @@
}).catch(function (error) {
console.log(error);
});
+ },
+ catalogIdChange: function (id) {
+ console.log("涓棿妯″潡鏀跺埌锛� " + id)
+ this.catalogId = id;
+ if (this.tabActiveName === "gbChannel") {
+ this.$refs.chooseChannelForGb.catalogIdChange(id);
+ }else {
+ this.$refs.chooseChannelFoStream.catalogIdChange(id);
+ }
+ },
+ updateChooseChannelCallback (id, nodeIds){
+ console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + id)
+ console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + nodeIds)
+ console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + typeof (nodeIds))
+ this.$refs.chooseChannelForCatalog.refreshCatalogById(id, nodeIds)
}
}
};
--
Gitblit v1.8.0