From 66f4d66755015b930e0792feb14046c2eac69884 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 31 May 2022 11:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 135 +++++++++--------- .../views/processCenter/procedure/index.vue | 2 +- .../components/listOfRegulations.vue | 66 +++++---- .../components/projectStatusAndProgress.vue | 16 ++- .../projectStatusBoard/index.vue | 19 +-- 5 files changed, 127 insertions(+), 111 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index f92e75487..468a5408c 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -2,9 +2,9 @@
- - - + + + {{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}} @@ -43,35 +43,35 @@
- - -
-
- {{$t('standard')}} + + +
+
+ {{$t('standard')}} +
+
- -
- - -
-
- {{$t('title')}} + + +
+
+ {{$t('title')}} +
+
- -
- - -
-
- {{$t('subtitle')}} + + +
+
+ {{$t('subtitle')}} +
+
- -
- - + + {{$t('reset')}} - +
@@ -130,7 +130,7 @@ class="ant-table" :loading="loading" :pagination="false" - :scroll="{x: 'max-content',y:'calc(100vh - 445px)'}" + :scroll="{x: '100%',y:'calc(100vh - 445px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -263,7 +263,7 @@ ], url: { addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy', - queryConditionInventory:'/dummy/dummyInventoryInfoEO/queryConditionInventory', + queryConditionInventory: '/dummy/dummyInventoryInfoEO/queryConditionInventory', list: '/dummy/dummyInventoryInfoEO/list', addModel: '/dummy/dummyInventoryInfoEO/add', editModel: '/dummy/dummyInventoryInfoEO/edit', @@ -285,6 +285,7 @@ dataIndex: 'serialNumber', width: 180, fixed: 'left', + ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { @@ -293,6 +294,7 @@ dataIndex: 'title', width: 180, fixed: 'left', + ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { @@ -301,54 +303,55 @@ dataIndex: 'subtitle', width: 180, fixed: 'left', + ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { title: this.$t('zoneOfApplication'), align: 'center', width: 150, + ellipsis: true, dataIndex: 'region_dictText', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('scopeOfApplication'), align: 'center', - width: 150, + width: 180, + ellipsis: true, dataIndex: 'shi4Yong4Fan4Wei2_dictText', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('status'), align: 'center', width: 100, + ellipsis: true, dataIndex: 'state_dictText', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('correspondingStandard'), align: 'center', width: 140, + ellipsis: true, dataIndex: 'correspondingStandard', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('implementationCategory'), align: 'center', width: 140, + ellipsis: true, dataIndex: 'implementType_dictText', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('ImplementationDate'), align: 'center', - width: 140, + width: 200, + ellipsis: true, dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - scopedSlots: { customRender: 'titleName' } }, { title: this.$t('vehicleInProductionDate'), align: 'center', - width: 140, + width: 210, ellipsis: true, dataIndex: 'implementTime' }, @@ -357,49 +360,49 @@ align: 'center', dataIndex: 'wvtaId', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('certificationType'), align: 'center', - width: 120, - dataIndex: 'attestationType_dictText', - scopedSlots: { customRender: 'titleName' } + width: 180, + ellipsis: true, + dataIndex: 'attestationType_dictText' }, { title: this.$t('certificationLevel'), align: 'center', - width: 180, - dataIndex: 'attestationRank_dictText', - scopedSlots: { customRender: 'titleName' } + width: 200, + ellipsis: true, + dataIndex: 'attestationRank_dictText' }, { title: this.$t('applicableSupplement'), align: 'center', - width: 180, - dataIndex: 'applicableSupplement', - scopedSlots: { customRender: 'titleName' } + width: 200, + ellipsis: true, + dataIndex: 'applicableSupplement' }, { title: this.$t('technicalField'), align: 'center', width: 180, - dataIndex: 'technologyTerritoryName', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + dataIndex: 'technologyTerritoryName' }, { title: this.$t('areaOfResponsibility'), align: 'center', width: 180, - dataIndex: 'dutyTerritory_dictText', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + dataIndex: 'dutyTerritory_dictText' }, { title: this.$t('remarks'), align: 'center', dataIndex: 'remark', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { @@ -419,15 +422,15 @@ title: this.$t('Sponsor'), dataIndex: 'designInitiator_dictText', width: 180, - align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + align: 'center' }, { title: this.$t('personLiable'), dataIndex: 'designDuty_dictText', width: 180, - align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + align: 'center' } ] }, @@ -447,15 +450,15 @@ title: this.$t('Sponsor'), dataIndex: 'prehomoInitiator_dictText', width: 180, - align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + align: 'center' }, { title: this.$t('personLiable'), dataIndex: 'prehomoDuty_dictText', width: 180, - align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true, + align: 'center' } ] }, @@ -476,14 +479,14 @@ dataIndex: 'verifyInitiator_dictText', width: 180, align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'verifyDuty_dictText', width: 180, align: 'center', - scopedSlots: { customRender: 'titleName' } + ellipsis: true } ] }, diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue index 3a821f0a6..a064b5a77 100644 --- a/jero-web/src/views/processCenter/procedure/index.vue +++ b/jero-web/src/views/processCenter/procedure/index.vue @@ -149,7 +149,7 @@ }, { title: this.$t('operation'), - width: 200, + width: 210, align: 'center', fixed: 'right', scopedSlots: { customRender: 'operation' } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index c29e0e9d9..3d0f27c08 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -134,7 +134,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: 'max-content',y:'calc(100vh - 400px)'}" + :scroll="{x: '100%',y:'calc(100vh - 400px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -365,14 +365,14 @@ align: 'center', dataIndex: 'inventoryAffirmStatusName', width: 240, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('taskAffirmStatus'), align: 'center', dataIndex: 'taskAffirmStatusName', width: 240, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, // { // title: this.$t('taskReleaseStatus'), @@ -384,100 +384,98 @@ align: 'center', dataIndex: 'region_dictText', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('correspondingStandard'), align: 'center', dataIndex: 'correspondingStandard', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('implementationCategory'), align: 'center', dataIndex: 'implementType_dictText', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('ImplementationDate'), align: 'center', width: 200, - dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' + dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + ellipsis: true }, { title: this.$t('vehicleInProductionDate'), align: 'center', width: 220, - dataIndex: 'implementTime' + dataIndex: 'implementTime', + ellipsis: true }, { title: this.$t('certificationType'), align: 'center', dataIndex: 'attestationType_dictText', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('certificationLevel'), align: 'center', dataIndex: 'attestationRank_dictText', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('applicableSupplement'), align: 'center', width: 220, dataIndex: 'applicableSupplement', - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: 'WVTA ID', align: 'center', dataIndex: 'wvtaId', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('areaOfResponsibility'), align: 'center', ellipsis: true, dataIndex: 'dutyTerritory_dictText', - width: 180, - scopedSlots: { customRender: 'titleName' } + width: 180 }, { title: this.$t('regulatoryEngineer'), align: 'center', ellipsis: true, dataIndex: 'regulationOwnerName', - width: 180, - scopedSlots: { customRender: 'titleName' } + width: 180 }, { title: this.$t('certifiedEngineer'), align: 'center', ellipsis: true, dataIndex: 'homologationEngineerName', - width: 180, - scopedSlots: { customRender: 'titleName' } + width: 180 }, { title: this.$t('engineeringInterfacePerson'), align: 'center', ellipsis: true, dataIndex: 'engineeringInterfacePersonName', - width: 180, - scopedSlots: { customRender: 'titleName' } + width: 180 }, { title: this.$t('remarks'), align: 'center', dataIndex: 'remark', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('confirmationOfDesignConformity'), @@ -487,6 +485,7 @@ dataIndex: 'designDeliverableTemplateName', align: 'center', width: 180, + ellipsis: true, scopedSlots: { customRender: 'designDeliverableTemplateName' } }, { @@ -494,19 +493,20 @@ dataIndex: 'designInitiatorName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'designDutyName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'designDueDate', align: 'center', + ellipsis: true, width: 140 }, { @@ -514,7 +514,7 @@ dataIndex: 'designRemark', align: 'center', width: 220, - scopedSlots: { customRender: 'titleName' } + ellipsis: true } ] }, @@ -526,6 +526,7 @@ dataIndex: 'prehomoDeliverableTemplateName', align: 'center', width: 180, + ellipsis: true, scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } }, { @@ -533,27 +534,28 @@ dataIndex: 'prehomoInitiatorName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'prehomoDutyName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'prehomoDueDate', align: 'center', - width: 140 + width: 140, + ellipsis: true }, { title: this.$t('descriptionDeliverables'), dataIndex: 'prehomoRemark', align: 'center', width: 220, - scopedSlots: { customRender: 'titleName' } + ellipsis: true } ] }, @@ -565,6 +567,7 @@ dataIndex: 'verifyDeliverableTemplateName', align: 'center', width: 180, + ellipsis: true, scopedSlots: { customRender: 'verifyDeliverableTemplateName' } }, { @@ -572,19 +575,20 @@ dataIndex: 'verifyInitiatorName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('personLiable'), dataIndex: 'verifyDutyName', align: 'center', width: 180, - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('TaskCutOffTime'), dataIndex: 'verifyDueDate', align: 'center', + ellipsis: true, width: 140 }, { @@ -592,7 +596,7 @@ dataIndex: 'verifyRemark', align: 'center', width: 220, - scopedSlots: { customRender: 'titleName' } + ellipsis: true } ] }, diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue index 743e8bed5..ace12773b 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue @@ -14,7 +14,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: true,y:'calc(100vh - 180px)'}" + :scroll="{x: '100%',y:'calc(100vh - 180px)'}" :data-source="dataSource" :columns="columns" > @@ -69,36 +69,42 @@ title: this.$t('entryName'), align: 'center', dataIndex: 'projectName', - width: 180 + width: 180, + ellipsis: true }, { title: this.$t('targetMarket'), align: 'center', dataIndex: 'targetMarket', - width: 180 + width: 180, + ellipsis: true }, { align: 'center', dataIndex: 'projectStatus', scopedSlots: { title: 'projectStatusTitle' }, - width: 240 + width: 240, + ellipsis: true }, { align: 'center', dataIndex: 'certificationProgress', - width: 340, + width: 380, + ellipsis: true, scopedSlots: { title: 'CertificationProgressTitle' } }, { align: 'center', dataIndex: 'inventory', width: 340, + ellipsis: true, scopedSlots: { title: 'listConfirmationStatusTitle' } }, { align: 'center', dataIndex: 'task', width: 340, + ellipsis: true, scopedSlots: { title: 'taskAffirmStatusTitle' } }, { diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index fb7955efe..4d3dadb29 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -68,13 +68,10 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: true,y:500}" + :scroll="{x: '100%',y:500}" :data-source="dataSource" :columns="columns" > - - {{text && text.length > 10 ? text.slice(0,10)+'...':text}} - {{this.$t('projectStatus')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}} @@ -136,36 +133,42 @@ align: 'center', dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' }, - width: 180 + width: 180, + ellipsis: true, }, { title: this.$t('targetMarket'), align: 'center', dataIndex: 'targetMarket', - width: 180 + width: 180, + ellipsis: true, }, { align: 'center', dataIndex: 'projectStatus', scopedSlots: { title: 'projectStatusTitle' }, - width: 240 + width: 240, + ellipsis: true, }, { align: 'center', dataIndex: 'certificationProgress', - width: 340, + width: 380, + ellipsis: true, scopedSlots: { title: 'CertificationProgressTitle' } }, { align: 'center', dataIndex: 'inventory', width: 340, + ellipsis: true, scopedSlots: { title: 'listConfirmationStatusTitle' } }, { align: 'center', dataIndex: 'task', width: 340, + ellipsis: true, scopedSlots: { title: 'taskAffirmStatusTitle' } }, {