From 9f16b5c553b479ea12fe368a7ecc748872ea8b98 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 12 六月 2025 11:11:27 +0800
Subject: [PATCH] 修改配置文件
---
web_src/src/components/dialog/chooseChannel.vue | 65 +++++++++++---------------------
1 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
old mode 100644
new mode 100755
index 85755e8..86bea83
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -1,14 +1,14 @@
<template>
-<div id="chooseChannel" v-loading="isLoging">
+<div id="chooseChannel" >
- <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-dialog title="閫夋嫨閫氶亾" v-loading="loading" 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 v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" ></chooseChannelForCatalog>
</el-main>
</el-container>
</el-tab-pane>
@@ -20,14 +20,14 @@
<el-tab-pane label="鍥芥爣閫氶亾" name="gbChannel">
<el-container>
<el-main style="background-color: #FFF;">
- <chooseChannelForGb ref="chooseChannelForGb" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelForGb>
+ <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 ref="chooseChannelFoStream" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
+ <chooseChannelFoStream ref="chooseChannelFoStream" :catalogId="catalogId" :catalogName="catalogName" :currentCatalogId="currentCatalogId" :platformId=platformId ></chooseChannelFoStream>
</el-main>
</el-container>
</el-tab-pane>
@@ -52,45 +52,37 @@
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,
+ loading: false,
tabActiveName: "gbChannel",
catalogTabActiveName: "catalog",
platformId: "",
+ platformDeviceId: "",
catalogId: "",
+ catalogName: "",
+ currentCatalogId: "",
platformName: "",
defaultCatalogId: "",
showDialog: false,
- chooseData: {}
+ chooseData: {},
+ winHeight: window.innerHeight - 250,
};
},
methods: {
- openDialog(platformId, platformName, defaultCatalogId, closeCallback) {
+ openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, closeCallback) {
+ console.log("defaultCatalogId: " + defaultCatalogId)
this.platformId = platformId
+ this.platformDeviceId = platformDeviceId
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() {
@@ -100,18 +92,17 @@
},
save: function() {
- var that = this;
this.$axios({
method:"post",
url:"/api/platform/update_channel_for_gb",
data:{
- platformId: that.platformId,
- channelReduces: that.chooseData
+ platformId: this.platformId,
+ channelReduces: this.chooseData
}
}).then((res)=>{
- if (res.data == true) {
- that.$message({
+ if (res.data.code === 0) {
+ this.$message({
showClose: true,
message: '淇濆瓨鎴愬姛,',
type: 'success'
@@ -120,22 +111,12 @@
}).catch(function (error) {
console.log(error);
});
+
},
- catalogIdChange: function (id) {
- console.log("涓棿妯″潡鏀跺埌锛� " + id)
+ catalogIdChange: function (id, name) {
this.catalogId = id;
- if (this.tabActiveName === "gbChannel") {
- this.$refs.chooseChannelForGb.catalogIdChange(id);
- }else {
- this.$refs.chooseChannelFoStream.catalogIdChange(id);
- }
+ this.catalogName = name;
},
- updateChooseChannelCallback (id, nodeIds){
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + id)
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + nodeIds)
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + typeof (nodeIds))
- this.$refs.chooseChannelForCatalog.refreshCatalogById(id, nodeIds)
- }
}
};
</script>
--
Gitblit v1.8.0