From 6ea852e7cd9159c46c923e3913808defc3c4001c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 6 Feb 2023 10:21:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95-=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/transferList.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue index 51884eaf4..3198cb9d6 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue @@ -31,6 +31,7 @@ import { getAction, postAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'transferList', components: {}, props: ['url'], + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { visible: false, @@ -79,25 +82,29 @@ title: this.$t('VirtualListName'), dataIndex: 'name', align: 'left', - ellipsis: true + ellipsis: true, + width: 223 }, { title: this.$t('instructionForUse'), dataIndex: 'useExplain', align: 'left', - ellipsis: true + ellipsis: true, + width: 223 }, { title: this.$t('updateTime'), dataIndex: 'updateTime', align: 'left', - ellipsis: true + ellipsis: true, + width: 223 }, { title: this.$t('creater'), dataIndex: 'createBy', align: 'left', - ellipsis: true + ellipsis: true, + width: 223 } ], dataList: [], @@ -161,6 +168,7 @@ }, handleCancel() { this.visible = false + this.$emit('visible') }, handleSubmit(flag) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { From 6bce97b148a474753f405e68b457c7a5117dc438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 6 Feb 2023 13:51:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86-=E5=88=97?= =?UTF-8?q?=E5=AE=BD=E5=8F=AF=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/escalationlibrary/index.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 8e8237d13..b7aa496dd 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -44,9 +44,9 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - - {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} - + + + {{$t('Exporthistory')}} {{$t('See')}} @@ -488,4 +488,14 @@ ::v-deep .ant-table-body { background: transparent!important; } + + ::v-deep .ant-table-row-cell-break-word{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + ::v-deep .ant-table-placeholder{ + margin-top: 8px !important + } \ No newline at end of file From 63187f69b4f5715ffcbbf399975307c3b13e221a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 6 Feb 2023 15:02:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=94=AF=E6=8C=81-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86-?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/viewFileModel/index.vue | 4 ++-- .../components/evaluationResultsList.vue | 22 +++++++++++++++++-- .../collectionOfRegulatoryOpinions/index.vue | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue index ffa3a9190..d9ac7c7a6 100644 --- a/jero-web/src/components/viewFileModel/index.vue +++ b/jero-web/src/components/viewFileModel/index.vue @@ -5,10 +5,10 @@ style="z-index: 1007" :visible="visibleFile" :maskClosable="false" - @cancel="visibleFile = false" + @cancel="visibleFile = false;$emit('visible')" > diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 674fb5c81..ce2a0159a 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -26,8 +26,10 @@ - + @@ -81,6 +83,7 @@ import { getAction, putAction, downloadFile } from '@/api/manage' import { mapGetters } from 'vuex' import { postAction } from '../../../../api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'evaluationResultsList', @@ -88,12 +91,14 @@ uploadFile, viewFileModel }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { loading: false, total: 0, pageSize: 10, pageNo: 1, + isTrue: true, flag:false, dataSource: [], formInline: {}, @@ -170,6 +175,9 @@ }, methods: { ...mapGetters(['userInfo']), + sVisible(){ + this.getDataAdmin() + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -257,6 +265,12 @@ seeFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) }, + getDataAdmin(){ + this.isTrue = false + setTimeout(()=>{ + this.isTrue = true + },100) + }, endProcessClick() { let query = { ids: this.$route.query.id @@ -276,7 +290,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 91cc0667f..d723a70cc 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -465,4 +465,8 @@ ::v-deep .ant-table-body { background: transparent !important; } + + ::v-deep .ant-table-placeholder { + margin-top: 8px !important; + } \ No newline at end of file