From 75ee368c96a3db085c51a6ee32efb3f341a8333e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 25 Jan 2022 20:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialog/chooseChannel.vue   | 21 +------------------
 .../dialog/chooseChannelForCatalog.vue        | 13 +++++++-----
 .../dialog/chooseChannelForStream.vue         |  4 ----
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 23df2c1b..d173955a 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -52,13 +52,7 @@ export default {
         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 {
@@ -84,14 +78,6 @@ export default {
             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() {
@@ -125,11 +111,6 @@ export default {
         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){
           console.log("中间模块收到选择通道变化： " + id)
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index 2d87bdd5..6c7fdabb 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -21,7 +21,7 @@
          <span v-if="node.data.type === 2" class="iconfont icon-zhibo"></span>
         <span style="padding-left: 1px">{{ node.label }}</span>
         <span>
-          <i style="margin-left: 5rem; color: #9d9d9d; padding-right: 20px" v-if="node.data.id === defaultCatalogId">默认</i>
+          <i style="margin-left: 5rem; color: #9d9d9d; padding-right: 20px" v-if="node.data.id === defaultCatalogIdSign">默认</i>
         </span>
       </span>
      </el-tree>
@@ -38,6 +38,8 @@ export default {
     name: 'chooseChannelForCatalog',
     props: ['platformId', 'platformName', 'defaultCatalogId', 'catalogIdChange'],
     created() {
+        this.chooseId = this.defaultCatalogId;
+        this.defaultCatalogIdSign = this.defaultCatalogId;
         this.initData();
         setTimeout(()=>{
           if (this.catalogIdChange)this.catalogIdChange(this.defaultCatalogId);
@@ -54,8 +56,9 @@ export default {
             children: 'children',
             isLeaf: 'leaf'
           },
+          defaultCatalogIdSign: null,
           chooseNode: null,
-          chooseId: this.defaultCatalogId,
+          chooseId: "",
           catalogTree: null,
           contextmenuShow: false
 
@@ -141,7 +144,7 @@ export default {
                 node.parent.loaded = false
                 node.parent.expand();
                 if (res.data.data) {
-                  this.defaultCatalogId = res.data.data;
+                  this.defaultCatalogIdSign = res.data.data;
                 }
               }
             })
@@ -160,7 +163,7 @@ export default {
           })
             .then((res)=> {
               if (res.data.code === 0) {
-                this.defaultCatalogId = id;
+                this.defaultCatalogIdSign = id;
               }
             })
             .catch(function (error) {
@@ -254,7 +257,7 @@ export default {
                 {
                   label: "设为默认",
                   icon: "el-icon-folder-checked",
-                  disabled: node.data.id === this.defaultCatalogId,
+                  disabled: node.data.id === this.defaultCatalogIdSign,
                   onClick: () => {
                     this.setDefaultCatalog(data.id)
                   },
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 1c6f66fb..931a58ec 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -253,10 +253,6 @@ export default {
         handleGBSelectionChange: function() {
             this.initData();
         },
-        // catalogIdChange: function(id) {
-        //   this.catalogId = id;
-        //   console.log("直播通道选择模块收到： " + id)
-        // },
     }
 };
 </script>