From b7ebdde436d85919a19155313873723ae8a090d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 26 Jul 2023 16:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86+=E6=98=8E=E7=BB=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AEbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Code/Fe/src/components/commonTabel-drawer/index.vue | 5 +++++ Code/Fe/src/components/filterForDetailPage/index.vue | 3 ++- Code/Fe/src/mixins/TableMixins.js | 2 +- Code/Fe/src/views/interfaceBoard/TestSchool.vue | 2 -- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue index ab4e34b..988db6d 100644 --- a/Code/Fe/src/components/commonTabel-drawer/index.vue +++ b/Code/Fe/src/components/commonTabel-drawer/index.vue @@ -69,6 +69,7 @@ @rowDrop="rowDrop" :searchOverallCoverHeight="'calc(100vh - 345px)'" :rowSource="'detail_api'" + :rowMaxHeight="rowMaxHeight" :totalCount="totalCountForDetail" :MaxResultCount="MaxResultCount" @sortChange="sortChangeForDetail" @@ -183,6 +184,10 @@ export default { LoadingMixins, ], props: { + rowMaxHeight:{ + type:String, + default:'calc(90vh - 450px)' + }, // 操作列按钮 buttonOperationList_left:{ type: Array, diff --git a/Code/Fe/src/components/filterForDetailPage/index.vue b/Code/Fe/src/components/filterForDetailPage/index.vue index a0560f5..89f8dad 100644 --- a/Code/Fe/src/components/filterForDetailPage/index.vue +++ b/Code/Fe/src/components/filterForDetailPage/index.vue @@ -229,6 +229,7 @@ mounted(){ }, methods: { rowDropForDetail(data,type){ + this.listColumns = data this.$emit("rowDropForDetail", data,type) }, // 初始化显示按钮 @@ -262,7 +263,7 @@ methods: { // 表头处理 let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/')) let _Columns = this.initApiColumnsForDto(res.items[0],_parentName) - this.listColumns = this.initTableColumns(_Columns) + this.listColumns = this.initTableColumns(_Columns,'detailPage_api') // 页面数据处理 if(res){ this.Loading.tableLoading = false diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js index 433ccad..cd28bcf 100644 --- a/Code/Fe/src/mixins/TableMixins.js +++ b/Code/Fe/src/mixins/TableMixins.js @@ -197,7 +197,7 @@ export const tableMixins = { .then(res=>{ // 表头处理 let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/')) - this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName)) + this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName),'detail_api') // 打印使用的全部数据存储 this.tableDataDetails = JSON.parse(JSON.stringify(res)) this.propsData = res diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue index ddacbcc..3696b13 100644 --- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue +++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue @@ -68,9 +68,7 @@ @goBack="goBack" > -