From baef2dd13de60aa558d61eae5da4785f94094abd Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 一月 2022 17:19:47 +0800 Subject: [PATCH] 优化级联选择通道页面目录Id在各个模块间的传递方式 --- web_src/src/components/dialog/chooseChannel.vue | 4 ++-- web_src/src/components/dialog/chooseChannelForGb.vue | 23 ++++++++--------------- web_src/src/components/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 ebca9dd..23df2c1 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 6c22a87..e46d3e5 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 @@ // }; // } }, - props: ['platformId', 'updateChoosedCallback'], + props: ['platformId','catalogId', 'updateChoosedCallback'], created() { this.initData(); }, @@ -77,7 +77,6 @@ channelType: "", online: "", choosed: "", - catalogId: null, currentPage: 1, count: 10, total: 0, @@ -110,11 +109,6 @@ 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 @@ } }).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 @@ 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 931083a..1c6f66f 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="娴両D" show-overflow-tooltip> + <el-table-column prop="stream" label="娴両D" 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 @@ // }; // } }, - props: ['platformId', 'updateChoosedCallback'], + props: ['platformId', 'catalogId', 'updateChoosedCallback'], created() { this.initData(); }, @@ -55,7 +55,6 @@ channelType: "", online: "", choosed: "", - catalogId: null, currentPage: 1, count: 10, total: 0, @@ -254,10 +253,10 @@ handleGBSelectionChange: function() { this.initData(); }, - catalogIdChange: function(id) { - this.catalogId = id; - console.log("鐩存挱閫氶亾閫夋嫨妯″潡鏀跺埌锛� " + id) - }, + // catalogIdChange: function(id) { + // this.catalogId = id; + // console.log("鐩存挱閫氶亾閫夋嫨妯″潡鏀跺埌锛� " + id) + // }, } }; </script> -- Gitblit v1.8.0