From 3adff7c3eb211f2d86ca9cae6823a98ae205ef29 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 1 Jun 2022 14:05: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 --- jero-web/src/main.js | 1 - .../views/documentManage/library/index.vue | 1 - .../components/virtualListDetails.vue | 51 ++++++++++++------- .../components/listOfRegulations.vue | 19 ++++++- .../components/settingList.vue | 28 +++++----- .../projectNonConformance/index.vue | 21 ++++++-- 6 files changed, 80 insertions(+), 41 deletions(-) diff --git a/jero-web/src/main.js b/jero-web/src/main.js index 2d3eb1817..f0bdff612 100644 --- a/jero-web/src/main.js +++ b/jero-web/src/main.js @@ -18,7 +18,6 @@ require('@/components/onlineForm/onlineForm') require('@/components/onlineForm/OnlineForm.css') import Antd, { version } from 'ant-design-vue' - console.log('ant-design-vue version:', version) import Viser from 'viser-vue' diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 51bc071a4..c19f85c4c 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -290,7 +290,6 @@ }, //处理列表中的点击事件 detailClick(item) { - console.log('item.',item) let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: item diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 468a5408c..fe79d6d95 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -38,9 +38,9 @@ -
- {{$t('listSubclauses')}} -
+ + +
@@ -85,10 +85,10 @@
-
- {{$t('DocumentStandard')}} -
+ + + +
@@ -130,7 +130,7 @@ class="ant-table" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 445px)'}" + :scroll="{x: '100%',y:'calc(100vh - 200px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -141,7 +141,9 @@ {{$t('deleteLib')}} - {{text && text.length > 10 ? text.slice(0,9)+'...':text}} + + {{text}} + {{record.designDeliverableTypeName}}
@@ -243,6 +245,7 @@ return { title: '维护虚拟清单', queryParam: {}, + components: {}, visibleFile: false, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', dataSourceFile: [], @@ -285,7 +288,6 @@ dataIndex: 'serialNumber', width: 180, fixed: 'left', - ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { @@ -294,7 +296,6 @@ dataIndex: 'title', width: 180, fixed: 'left', - ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { @@ -303,7 +304,6 @@ dataIndex: 'subtitle', width: 180, fixed: 'left', - ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { @@ -311,42 +311,42 @@ align: 'center', width: 150, ellipsis: true, - dataIndex: 'region_dictText', + dataIndex: 'region_dictText' }, { title: this.$t('scopeOfApplication'), align: 'center', width: 180, ellipsis: true, - dataIndex: 'shi4Yong4Fan4Wei2_dictText', + dataIndex: 'shi4Yong4Fan4Wei2_dictText' }, { title: this.$t('status'), align: 'center', width: 100, ellipsis: true, - dataIndex: 'state_dictText', + dataIndex: 'state_dictText' }, { title: this.$t('correspondingStandard'), align: 'center', width: 140, ellipsis: true, - dataIndex: 'correspondingStandard', + dataIndex: 'correspondingStandard' }, { title: this.$t('implementationCategory'), align: 'center', width: 140, ellipsis: true, - dataIndex: 'implementType_dictText', + dataIndex: 'implementType_dictText' }, { title: this.$t('ImplementationDate'), align: 'center', width: 200, ellipsis: true, - dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' }, { title: this.$t('vehicleInProductionDate'), @@ -820,6 +820,7 @@ justify-content: space-between; border-bottom: 2px #eff1f3 solid; background: #fff; + z-index: 1000; .Virtual-detail-title { display: inline-block; @@ -933,6 +934,19 @@ text-align: right; margin-top: 20px; } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + text-justify: inter-ideograph; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + -webkit-box-orient: vertical; + word-break: break-all + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3d0f27c08..1cd4c12e6 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: '100%',y:'calc(100vh - 400px)'}" + :scroll="{x: '100%',y:'calc(100vh - 200px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -157,7 +157,9 @@ - {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} + + {{text}} + {{ record.designDeliverableTypeName }}
@@ -1559,6 +1561,19 @@ height: 42px; line-height: 48px; } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + text-justify: inter-ideograph; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + -webkit-box-orient: vertical; + word-break: break-all + } \ No newline at end of file