From ad4afd9d676739d8ad67c134b9ea05ad32cf0c68 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 17 Jan 2022 09:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E9=81=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/dialog/chooseChannel.vue          | 2 +-
 web_src/src/components/dialog/chooseChannelForGb.vue     | 5 +++--
 web_src/src/components/dialog/chooseChannelForStream.vue | 5 +++--
 web_src/src/components/dialog/importChannel.vue          | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 85755e84..cc810c93 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -7,7 +7,7 @@
           <el-tabs v-model="catalogTabActiveName" >
             <el-tab-pane label="目录结构" name="catalog">
               <el-container>
-                <el-main style="background-color: #FFF;">
+                <el-main v-bind:style="{backgroundColor: '#FFF', maxHeight:  winHeight + 'px'}">
                   <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange"></chooseChannelForCatalog>
                 </el-main>
               </el-container>
diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue
index 4b2be34b..b8a7a0ce 100644
--- a/web_src/src/components/dialog/chooseChannelForGb.vue
+++ b/web_src/src/components/dialog/chooseChannelForGb.vue
@@ -23,7 +23,7 @@
 
         <el-checkbox @change="shareAllCheckedChange">全部共享</el-checkbox>
     </div>
-    <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" @selection-change="checkedChange" >
+    <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" @selection-change="checkedChange" :height="winHeight">
         <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
         <el-table-column prop="channelId" label="通道编号" width="210">
         </el-table-column>
@@ -74,7 +74,8 @@ export default {
             currentPage: 1,
             count: 10,
             total: 0,
-            eventEnanle: false
+            eventEnanle: false,
+            winHeight: window.innerHeight - 350,
 
         };
     },
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 20c42efb..3cc5f3cf 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,6 +1,6 @@
 <template>
 <div id="chooseChannelFoStream" >
-    <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" >
+    <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" :height="winHeight">
         <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
         <el-table-column prop="name" label="名称" show-overflow-tooltip>
         </el-table-column>
@@ -52,7 +52,8 @@ export default {
             currentPage: 1,
             count: 10,
             total: 0,
-            eventEnanle: false
+            eventEnanle: false,
+            winHeight: window.innerHeight - 350,
 
         };
     },
diff --git a/web_src/src/components/dialog/importChannel.vue b/web_src/src/components/dialog/importChannel.vue
index 6d83819d..efd0893b 100644
--- a/web_src/src/components/dialog/importChannel.vue
+++ b/web_src/src/components/dialog/importChannel.vue
@@ -14,7 +14,7 @@
         <el-upload
           class="upload-box"
           drag
-          action="debug/api/push/upload"
+          :action="uploadUrl"
           name="file"
           >
           <i class="el-icon-upload"></i>
@@ -38,6 +38,7 @@ export default {
       showDialog: false,
       isLoging: false,
       isEdit: false,
+      uploadUrl: "debug/api/push/upload",
     };
   },
   methods: {