From baef2dd13de60aa558d61eae5da4785f94094abd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 17 Jan 2022 17:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=A7=E8=81=94=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=80=9A=E9=81=93=E9=A1=B5=E9=9D=A2=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?Id=E5=9C=A8=E5=90=84=E4=B8=AA=E6=A8=A1=E5=9D=97=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E4=BC=A0=E9=80=92=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dialog/chooseChannel.vue   |  4 ++--
 .../components/dialog/chooseChannelForGb.vue  | 23 +++++++------------
 .../dialog/chooseChannelForStream.vue         | 21 ++++++++---------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index ebca9dd3..23df2c1b 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -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" :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 ref="chooseChannelFoStream" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
+                  <chooseChannelFoStream ref="chooseChannelFoStream" :catalogId="catalogId" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
                 </el-main>
               </el-container>
             </el-tab-pane>
diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue
index 6c22a876..e46d3e57 100644
--- a/web_src/src/components/dialog/chooseChannelForGb.vue
+++ b/web_src/src/components/dialog/chooseChannelForGb.vue
@@ -24,11 +24,11 @@
 <!--        <el-checkbox @change="shareAllCheckedChange">全部共享</el-checkbox>-->
     </div>
     <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" :height="winHeight">
-        <el-table-column prop="channelId" label="通道编号" width="210">
+        <el-table-column prop="channelId" label="通道编号" width="180" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="通道名称" show-overflow-tooltip>
+        <el-table-column prop="name" label="通道名称" show-overflow-tooltip align="center">
         </el-table-column>
-        <el-table-column prop="deviceId" label="设备编号" width="210" >
+        <el-table-column prop="deviceId" label="设备编号" width="180" align="center">
         </el-table-column>
         <el-table-column label="设备地址" width="180" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@ export default {
         //     };
         // }
     },
-    props: ['platformId', 'updateChoosedCallback'],
+    props: ['platformId','catalogId', 'updateChoosedCallback'],
     created() {
         this.initData();
     },
@@ -77,7 +77,6 @@ export default {
             channelType: "",
             online: "",
             choosed: "",
-            catalogId: null,
             currentPage: 1,
             count: 10,
             total: 0,
@@ -110,11 +109,6 @@ export default {
             console.log(val)
             console.log(row)
         },
-        // selectDisable: function (){
-        //   if (this.catalogId == null) {
-        //     return false;
-        //   }
-        // },
         add: function (row) {
           console.log(row)
           row.catalogId = this.catalogId
@@ -146,7 +140,6 @@ export default {
             }
           }).then((res)=>{
             console.log("移除成功")
-            let nodeIds = new Array();
             if(this.updateChoosedCallback)this.updateChoosedCallback(row.catalogId)
             row.platformId = null;
             row.catalogId = null
@@ -283,10 +276,10 @@ export default {
         handleGBSelectionChange: function() {
             this.initData();
         },
-        catalogIdChange: function(id) {
-            this.catalogId = id;
-            console.log("通道选择模块收到： " + id)
-        },
+        // catalogIdChange: function(id) {
+        //     this.catalogId = id;
+        //     console.log("通道选择模块收到： " + id)
+        // },
     }
 };
 </script>
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 931083ad..1c6f66fb 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,13 +1,13 @@
 <template>
 <div id="chooseChannelFoStream" >
     <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight">
-        <el-table-column prop="name" label="名称" show-overflow-tooltip>
+        <el-table-column prop="name" label="名称" show-overflow-tooltip align="center">
         </el-table-column>
-        <el-table-column prop="app" label="应用名" show-overflow-tooltip>
+        <el-table-column prop="app" label="应用名" show-overflow-tooltip align="center">
         </el-table-column>
-        <el-table-column prop="stream" label="流ID"  show-overflow-tooltip>
+        <el-table-column prop="stream" label="流ID"  show-overflow-tooltip align="center">
         </el-table-column>
-        <el-table-column prop="gbId" label="国标编码" show-overflow-tooltip>
+        <el-table-column prop="gbId" label="国标编码" show-overflow-tooltip align="center">
         </el-table-column>
         <el-table-column label="流来源" width="100" align="center">
             <template slot-scope="scope">
@@ -17,7 +17,7 @@
             </div>
             </template>
         </el-table-column>
-      <el-table-column label="操作" width="100" align="center" fixed="right">
+      <el-table-column label="操作" width="100" align="center" fixed="right" >
         <template slot-scope="scope">
           <el-button-group>
             <el-button size="mini" icon="el-icon-plus" v-if="!scope.row.platformId" @click="add(scope.row)">添加</el-button>
@@ -43,7 +43,7 @@ export default {
         //     };
         // }
     },
-    props: ['platformId',  'updateChoosedCallback'],
+    props: ['platformId', 'catalogId',  'updateChoosedCallback'],
     created() {
         this.initData();
     },
@@ -55,7 +55,6 @@ export default {
             channelType: "",
             online: "",
             choosed: "",
-            catalogId: null,
             currentPage: 1,
             count: 10,
             total: 0,
@@ -254,10 +253,10 @@ export default {
         handleGBSelectionChange: function() {
             this.initData();
         },
-        catalogIdChange: function(id) {
-          this.catalogId = id;
-          console.log("直播通道选择模块收到： " + id)
-        },
+        // catalogIdChange: function(id) {
+        //   this.catalogId = id;
+        //   console.log("直播通道选择模块收到： " + id)
+        // },
     }
 };
 </script>