From 288380a38f15a2137d618cc6487bfdfd2a966189 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 1 Jun 2022 15:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=92=8C=E7=BC=96=E5=8F=B7=E4=B8=A4=E8=A1=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrTable/DocTable.vue | 53 +++++++++++++------ jero-web/src/components/OcrTable/index.vue | 41 ++++++++++---- .../src/components/SplitTable/DocTable.vue | 46 +++++++++++----- jero-web/src/components/SplitTable/index.vue | 49 ++++++++++------- jero-web/src/components/tableDate/index.vue | 32 +++++++---- .../components/DocumentLibrary.vue | 42 ++++++++++++--- .../components/virtualListDetails.vue | 4 +- .../components/listOfRegulations.vue | 4 +- .../components/nonConformance.vue | 18 ++++++- .../projectNonConformance/index.vue | 2 + 10 files changed, 209 insertions(+), 82 deletions(-) diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index 1ddc73b8f..3db485a60 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -29,6 +29,11 @@ + + + {{text}} + + @@ -80,9 +85,9 @@ type: Boolean, default: false }, - type:{ - type:String, - default:'' + type: { + type: String, + default: '' } }, data() { @@ -116,7 +121,7 @@ }) eventBUs.$on('searchReset', target => { this.searchParmes = {} - this.selectedRowKeys=[] + this.selectedRowKeys = [] this.getData() this.getTableList() }) @@ -141,13 +146,13 @@ var jsonHead = res.result this.columns = [] this.columns.push( - { - title: this.$t('serialNumber'), - dataIndex: 'index', - key: 'index', - align: 'center', - customRender: (text,record,index) => `${index+1}`, - }) + { + title: this.$t('serialNumber'), + dataIndex: 'index', + key: 'index', + align: 'center', + customRender: (text, record, index) => `${index + 1}` + }) jsonHead.forEach((res, index) => { this.columns.push({ title: res.db_field_txt, @@ -160,6 +165,11 @@ this.columns[index].scopedSlots = { customRender: 'detailClick' } + } else if (res.db_field_txt == 'number' || res.db_field_txt == 'Title' || res.db_field_txt == '编号' || res.db_field_txt == '标题') { + this.columns[index].scopedSlots = { + customRender: 'detailName' + } + this.columns[index].ellipsis = false } else { this.columns[index].scopedSlots = { customRender: 'detailText' @@ -194,7 +204,7 @@ let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { ...this.searchParmes, - type:this.type, + type: this.type, orderBy: this.orderBy, orderByField: this.orderByField, pageNo: pageNo + '', @@ -220,7 +230,7 @@ this.pageSize = pageSize this.getTableList() }, - onSelectChange(value,rows) { + onSelectChange(value, rows) { this.selectedRowKeys = value this.$emit('onSelectChange', value, rows) }, @@ -237,10 +247,6 @@ .table .ant-table-column-title { font-weight: bold; } - - .ant-table td { - white-space: nowrap; - } diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index 2c0ee74d1..0322fdee2 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -6,7 +6,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :loading="loading" :columns="columns" @@ -32,11 +32,16 @@ {{text}} - - - - - + + + {{text}} + + + + + + + @@ -141,12 +146,18 @@ dataIndex: res.db_field_name, align: 'center', ellipsis: true, + width:170, sorter: res.sort }) if (res.click) { this.columns[index].scopedSlots = { customRender: 'detailClick' } + } else if (res.db_field_txt == 'number' || res.db_field_txt == 'Title' || res.db_field_txt == '编号' || res.db_field_txt == '标题') { + this.columns[index].scopedSlots = { + customRender: 'detailName' + } + this.columns[index].ellipsis = false } else { this.columns[index].scopedSlots = { customRender: 'detailText' @@ -210,7 +221,7 @@ this.pageSize = pageSize this.getTableList() }, - onSelectChange(value,rows) { + onSelectChange(value, rows) { this.selectedRowKeys = value this.$emit('onSelectChange', value, rows) }, @@ -228,9 +239,6 @@ font-weight: bold; } - .ant-table td { - white-space: nowrap; - } diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue index 2f26cadf0..6a6861442 100644 --- a/jero-web/src/components/SplitTable/DocTable.vue +++ b/jero-web/src/components/SplitTable/DocTable.vue @@ -6,7 +6,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :loading="loading" :columns="columns" @@ -31,9 +31,14 @@ - {{text && text.length > 18?text.slice(0,17)+'...':text}} + {{text}} + + + {{text}} + +
@@ -76,9 +81,9 @@ type: Boolean, default: false }, - type:{ - type:String, - default:'' + type: { + type: String, + default: '' } }, data() { @@ -112,7 +117,7 @@ }) eventBUs.$on('searchReset', target => { this.searchParmes = {} - this.selectedRowKeys=[] + this.selectedRowKeys = [] this.getData() this.getTableList() }) @@ -150,12 +155,18 @@ dataIndex: res.db_field_name, align: 'center', ellipsis: true, - sorter: res.sort + sorter: res.sort, + width: 170 }) if (res.click) { this.columns[index].scopedSlots = { customRender: 'detailClick' } + } else if (res.db_field_txt == 'number' || res.db_field_txt == 'Title' || res.db_field_txt == '编号' || res.db_field_txt == '标题') { + this.columns[index].scopedSlots = { + customRender: 'detail' + } + this.columns[index].ellipsis = false } else { this.columns[index].scopedSlots = { customRender: 'detailText' @@ -190,7 +201,7 @@ let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { ...this.searchParmes, - type:this.type, + type: this.type, orderBy: this.orderBy, orderByField: this.orderByField, pageNo: pageNo + '', @@ -216,7 +227,7 @@ this.pageSize = pageSize this.getTableList() }, - onSelectChange(value,rows) { + onSelectChange(value, rows) { this.selectedRowKeys = value this.$emit('onSelectChange', value, rows) }, @@ -233,10 +244,6 @@ .table .ant-table-column-title { font-weight: bold; } - - .ant-table td { - white-space: nowrap; - } diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 45d17a3fa..6c425aa1c 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -6,7 +6,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :loading="loading" :columns="columns" @@ -16,9 +16,10 @@ - - - + + + {{ol.text}} @@ -35,10 +36,11 @@ - + {{text}} +
@@ -82,8 +84,8 @@ default: false }, infoId: { - type:String, - default:'' + type: String, + default: '' } }, data() { @@ -125,9 +127,9 @@ this.getTableList() }, methods: { - urlClick(text,record) { - if(record.documentId === null) { - this.$message.warning(this.$t('Correspondingstandarddeleted')) + urlClick(text, record) { + if (record.documentId === null) { + this.$message.warning(this.$t('Correspondingstandarddeleted')) } else { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', @@ -158,19 +160,21 @@ dataIndex: res.db_field_name, align: 'center', ellipsis: true, - sorter: res.sort + sorter: res.sort, + width: 170 }) - if(res.db_field_name==''){ + if (res.db_field_name == '') { // scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' } this.columns[index].scopedSlots = { customRender: 'detailText' } - if(res.db_field_txt === "编号" || res.db_field_txt === "标题" ){ + if (res.db_field_txt == 'number' || res.db_field_txt == 'Title' || res.db_field_txt == '编号' || res.db_field_txt == '标题') { this.columns[index].scopedSlots = { customRender: 'detail' } + this.columns[index].ellipsis = false } }) @@ -204,7 +208,7 @@ ...this.searchParmes, orderBy: this.orderBy, orderByField: this.orderByField, - infoId:this.infoId, + infoId: this.infoId, pageNo: pageNo + '', pageSize: pageSize + '' } @@ -254,10 +258,6 @@ .table .ant-table-column-title { font-weight: bold; } - - .ant-table td { - white-space: nowrap; - } diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 2358e18eb..1137fbc59 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -6,7 +6,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :loading="loading" :rowClassName="rowClassName" @@ -28,21 +28,20 @@ - - {{text && text.length > 18?text.slice(0,17)+'...':text}} + + {{text}} - {{text && text.length > 18?text.slice(0,17)+'...':text}} + {{text}} - {{text && text.length > 18?text.slice(0,17)+'...':text}} + {{text}} -
@@ -150,12 +149,14 @@ dataIndex: res.db_field_name, align: 'center', ellipsis: true, - sorter: res.sort + sorter: res.sort, + width: 170 }) if (res.click) { this.columns[index].scopedSlots = { customRender: 'detailClick' } + this.columns[index].ellipsis = false } else if (res.urlClick) { this.columns[index].scopedSlots = { customRender: 'urlClick' @@ -245,10 +246,6 @@ font-weight: bold; } - .ant-table td { - white-space: nowrap; - } - .rowClassNameBack { background: #f5f5f5; } @@ -268,4 +265,17 @@ text-align: right; margin-top: 20px; } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 8f84cc70b..4b514b79c 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -89,7 +89,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -105,10 +105,13 @@ {{$t('Push')}} - + - + @@ -250,28 +253,36 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serial_number', + width: 170, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + width: 170, scopedSlots: { customRender: 'titleName' } }, { title: this.$t('fileName'), align: 'center', dataIndex: 'file_name', + ellipsis: true, + width: 170, scopedSlots: { customRender: 'file_name' } }, { title: this.$t('status'), align: 'center', + width: 140, + ellipsis: true, dataIndex: 'state' }, { title: this.$t('zoneOfApplication'), align: 'center', + width: 170, + ellipsis: true, dataIndex: 'region' }, // { @@ -282,21 +293,29 @@ { title: this.$t('technicalField'), align: 'center', + ellipsis: true, + width: 170, dataIndex: 'technology_territory' }, { title: this.$t('releaseDate'), align: 'center', + ellipsis: true, + width: 170, dataIndex: 'issue_time' }, { title: this.$t('vehicleInProductionDate'), align: 'center', + ellipsis: true, + width: 210, dataIndex: 'implement_time' }, { title: this.$t('ImplementationDate'), align: 'center', + ellipsis: true, + width: 210, dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1' }, { @@ -674,10 +693,6 @@ font-weight: bold; } - .ant-table td { - white-space: nowrap; - } - .checkbox-left .ant-checkbox-inner { width: 18px !important; height: 18px !important; @@ -873,4 +888,17 @@ overflow: hidden; text-overflow: ellipsis; } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index fe79d6d95..9a400b167 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -941,10 +941,10 @@ display: -webkit-box; text-overflow: ellipsis; /*! autoprefixer: off */ - text-justify: inter-ideograph; + -webkit-box-orient: vertical; -webkit-line-clamp: 2; /*! autoprefixer: on;*/ - -webkit-box-orient: vertical; + text-justify: inter-ideograph; word-break: break-all } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1cd4c12e6..4507df672 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1568,10 +1568,10 @@ display: -webkit-box; text-overflow: ellipsis; /*! autoprefixer: off */ - text-justify: inter-ideograph; + -webkit-box-orient: vertical; -webkit-line-clamp: 2; /*! autoprefixer: on;*/ - -webkit-box-orient: vertical; + text-justify: inter-ideograph; word-break: break-all } diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 1ccefc634..96cf86727 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -59,8 +59,10 @@ :data-source="dataSource" :columns="columns" > - - {{text}} + + + {{text}} +
@@ -326,4 +328,16 @@ text-align: right; margin-top: 20px; } + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 5ce50142c..74f866e3d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -466,5 +466,7 @@ -webkit-box-orient: vertical; -webkit-line-clamp: 2; /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all } \ No newline at end of file