From 22441ad5a130b1802af2c5ebe5083e8297edb682 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:23:46 +0800
Subject: [PATCH] Merge pull request #643 from XiaoQiTong/wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannel.vue | 86 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 87fc62e..e0e79c3 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 v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></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" :catalogId="catalogId" :catalogName="catalogName" :platformId=platformId ></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" :catalogId="catalogId" :catalogName="catalogName" :currentCatalogId="currentCatalogId" :platformId=platformId ></chooseChannelFoStream>
+ </el-main>
+ </el-container>
</el-tab-pane>
- </el-tabs>
+ </el-tabs>
+ </el-col>
+ </el-row>
+
</el-dialog>
</div>
</template>
@@ -27,39 +42,50 @@
<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 () {
- // return {
- // sharedUrl: window.location.host + '/' + this.videoUrl,
- // sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
- // sharedRtmp: this.videoUrl
- // };
- // }
+
},
data() {
return {
isLoging: false,
tabActiveName: "gbChannel",
+ catalogTabActiveName: "catalog",
platformId: "",
- isLoging: false,
+ platformDeviceId: "",
+ catalogId: "",
+ catalogName: "",
+ currentCatalogId: "",
+ platformName: "",
+ defaultCatalogId: "",
showDialog: false,
- chooseData: {}
+ treeType: null,
+ chooseData: {},
+ winHeight: window.innerHeight - 250,
};
},
methods: {
- openDialog: function (platformId, closeCallback) {
- console.log(platformId)
+ openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, treeType, closeCallback) {
+ console.log("defaultCatalogId: " + defaultCatalogId)
this.platformId = platformId
+ this.platformDeviceId = platformDeviceId
+ this.platformName = platformName
+ this.defaultCatalogId = defaultCatalogId
this.showDialog = true
this.closeCallback = closeCallback
+ this.treeType = treeType
+ },
+ tabClick (tab, event){
+
},
close: function() {
this.closeCallback()
@@ -78,7 +104,7 @@
channelReduces: that.chooseData
}
}).then((res)=>{
- if (res.data == true) {
+ if (res.data.code === 0) {
that.$message({
showClose: true,
message: '淇濆瓨鎴愬姛,',
@@ -88,7 +114,11 @@
}).catch(function (error) {
console.log(error);
});
- }
+ },
+ catalogIdChange: function (id, name) {
+ this.catalogId = id;
+ this.catalogName = name;
+ },
}
};
</script>
--
Gitblit v1.8.0