From ffcc0b115dacda87be228ba142a4bb39d9ba3432 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 10:27:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 +- jero-web/src/common/lang/zh-cn.js | 5 +-- .../documentComparison/index.vue | 43 +++++++++++-------- .../src/views/regulationsKanban/index.vue | 23 ++++++---- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ec11969e7..1547b8510 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1154,8 +1154,8 @@ module.exports = { category: 'Category', RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results', ViewConformanceResults: 'View Conformance Results', - CommentsCollectionResultsForReference: 'Comments Collection Results For Reference', - TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For Reference', + CommentsCollectionResultsForReference: 'Comments Collection Results For', + TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For', ComplianceConfirmationRecord: 'Compliance Confirmation Record', complianceConfirmation: 'Compliance Confirmation', noComparisonDocumentSelected: 'No comparison document selected', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7e5ff04b1..202ac4dda 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1158,7 +1158,6 @@ module.exports = { category: '类别', RegulatoryProcessEvaluationResults: '法规流程评估结果', ViewConformanceResults: '查看符合性结果', - CommentsCollectionResultsForReference: '意见收集结果参考', TechnicalEvaluationResultsForReference: '技术评估结果参考', ComplianceConfirmationRecord: '符合性确认记录', complianceConfirmation: '符合性确认', @@ -1259,8 +1258,8 @@ module.exports = { category: '类别', RegulatoryProcessEvaluationResults: '法规流程评估结果', ViewConformanceResults: '查看符合性结果', - CommentsCollectionResultsForReference: '意见收集结果参考', - TechnicalEvaluationResultsForReference: '技术评估结果参考', + CommentsCollectionResultsForReference: '意见收集结果', + TechnicalEvaluationResultsForReference: '技术评估结果', ComplianceConfirmationRecord: '符合性确认记录', complianceConfirmation: '符合性确认', Deriveconformanceresults: '导出符合性结果', diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 467d798de..0db7f9fde 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -150,20 +150,20 @@ scopedSlots: { customRender: 'serialNumberLeft' } }, { - title: this.$t('TextStatus'), + title: this.$t('TextStatus') + 1, align: 'center', width: 200, ellipsis: true, dataIndex: 'fileTypeLeft' }, - { - title: this.$t('fileName'), - align: 'center', - width: 270, - ellipsis: true, - dataIndex: 'fileNameLeft', - scopedSlots: { customRender: 'fileNameLeft' } - }, + // { + // title: this.$t('fileName'), + // align: 'center', + // width: 270, + // ellipsis: true, + // dataIndex: 'fileNameLeft', + // scopedSlots: { customRender: 'fileNameLeft' } + // }, { title: this.$t('standard') + 2, align: 'center', @@ -181,20 +181,20 @@ width: 170 }, { - title: this.$t('TextStatus'), + title: this.$t('TextStatus') + 2, align: 'center', width: 200, ellipsis: true, dataIndex: 'fileTypeRight' }, - { - title: this.$t('fileName'), - align: 'center', - width: 270, - ellipsis: true, - dataIndex: 'fileNameRight', - scopedSlots: { customRender: 'fileNameRight' } - }, + // { + // title: this.$t('fileName'), + // align: 'center', + // width: 270, + // ellipsis: true, + // dataIndex: 'fileNameRight', + // scopedSlots: { customRender: 'fileNameRight' } + // }, { title: this.$t('releaseSituation'), align: 'center', @@ -202,6 +202,13 @@ ellipsis: true, dataIndex: 'releaseStateTitle' }, + { + title: this.$t('creater'), + align: 'center', + width: 170, + ellipsis: true, + dataIndex: 'createBy' + }, { title: this.$t('remarks'), align: 'center', diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index b7366a734..4dd1c1f39 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -86,17 +86,17 @@ > - {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }} + {{ text }} - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} - {{$t('ViewConformanceResults')}} + {{$t('view')}} @@ -168,21 +168,24 @@ export default { title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - width: 180, + width: 300, + ellipsis: true, scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', - width: 250, + width: 300, + ellipsis: true, scopedSlots: { customRender: 'standard' } }, { title: this.$t('status'), align: 'center', + ellipsis: true, dataIndex: 'state_dicText', - width: 180 + width: 120 }, // { // title: this.$t('category'), @@ -194,13 +197,14 @@ export default { align: 'center', dataIndex: 'technologyTerritory_dicText', width: 250, + ellipsis: true, scopedSlots: { customRender: 'technicalField' } }, { - title: this.$t('RegulatoryProcessEvaluationResults'), + title: this.$t('evaluationResults'), align: 'center', fixed: 'right', - width: 300, + width: 180, scopedSlots: { customRender: 'operation' } } ], @@ -282,7 +286,8 @@ export default { // 导出历史 handlecody(e) { this.drawerVisible = true - this.titleTag = e.serialNumber + this.$t('ComplianceConfirmationRecord') + // e.serialNumber + + this.titleTag = this.$t('evaluationResults') this.paramsManifestId = e.id this.item = {...e} },