Commit ad4afd9d676739d8ad67c134b9ea05ad32cf0c68

Authored by 648540858
1 parent b7c16fe6

优化通道选择页面样式

web_src/src/components/dialog/chooseChannel.vue
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <el-tabs v-model="catalogTabActiveName" > 7 <el-tabs v-model="catalogTabActiveName" >
8 <el-tab-pane label="目录结构" name="catalog"> 8 <el-tab-pane label="目录结构" name="catalog">
9 <el-container> 9 <el-container>
10 - <el-main style="background-color: #FFF;"> 10 + <el-main v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
11 <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange"></chooseChannelForCatalog> 11 <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange"></chooseChannelForCatalog>
12 </el-main> 12 </el-main>
13 </el-container> 13 </el-container>
web_src/src/components/dialog/chooseChannelForGb.vue
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 23
24 <el-checkbox @change="shareAllCheckedChange">全部共享</el-checkbox> 24 <el-checkbox @change="shareAllCheckedChange">全部共享</el-checkbox>
25 </div> 25 </div>
26 - <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" @selection-change="checkedChange" > 26 + <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" @selection-change="checkedChange" :height="winHeight">
27 <el-table-column type="selection" width="55" align="center" fixed > </el-table-column> 27 <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
28 <el-table-column prop="channelId" label="通道编号" width="210"> 28 <el-table-column prop="channelId" label="通道编号" width="210">
29 </el-table-column> 29 </el-table-column>
@@ -74,7 +74,8 @@ export default { @@ -74,7 +74,8 @@ export default {
74 currentPage: 1, 74 currentPage: 1,
75 count: 10, 75 count: 10,
76 total: 0, 76 total: 0,
77 - eventEnanle: false 77 + eventEnanle: false,
  78 + winHeight: window.innerHeight - 350,
78 79
79 }; 80 };
80 }, 81 },
web_src/src/components/dialog/chooseChannelForStream.vue
1 <template> 1 <template>
2 <div id="chooseChannelFoStream" > 2 <div id="chooseChannelFoStream" >
3 - <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" > 3 + <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" :height="winHeight">
4 <el-table-column type="selection" width="55" align="center" fixed > </el-table-column> 4 <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
5 <el-table-column prop="name" label="名称" show-overflow-tooltip> 5 <el-table-column prop="name" label="名称" show-overflow-tooltip>
6 </el-table-column> 6 </el-table-column>
@@ -52,7 +52,8 @@ export default { @@ -52,7 +52,8 @@ export default {
52 currentPage: 1, 52 currentPage: 1,
53 count: 10, 53 count: 10,
54 total: 0, 54 total: 0,
55 - eventEnanle: false 55 + eventEnanle: false,
  56 + winHeight: window.innerHeight - 350,
56 57
57 }; 58 };
58 }, 59 },
web_src/src/components/dialog/importChannel.vue
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <el-upload 14 <el-upload
15 class="upload-box" 15 class="upload-box"
16 drag 16 drag
17 - action="debug/api/push/upload" 17 + :action="uploadUrl"
18 name="file" 18 name="file"
19 > 19 >
20 <i class="el-icon-upload"></i> 20 <i class="el-icon-upload"></i>
@@ -38,6 +38,7 @@ export default { @@ -38,6 +38,7 @@ export default {
38 showDialog: false, 38 showDialog: false,
39 isLoging: false, 39 isLoging: false,
40 isEdit: false, 40 isEdit: false,
  41 + uploadUrl: "debug/api/push/upload",
41 }; 42 };
42 }, 43 },
43 methods: { 44 methods: {