diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cdb0e83cb..a9bc1cebd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -687,4 +687,8 @@ module.exports = { verificationComplianceConfirmationDeadline:'Verification compliance confirmation deadline', pleaseEnterTheCorrectWebAddress:'Please enter the correct web address', updateTime:'update Time', + comment:'comment', + historicalVersion:'Historical version', + versionName:'Version name', + finalizationTime:'Finalization time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 37f374c6d..9646e479b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -691,4 +691,8 @@ module.exports = { verificationComplianceConfirmationDeadline:'验证符合性确认截止时间', pleaseEnterTheCorrectWebAddress:'请输入正确的网址', updateTime:'更新时间', + comment:'评论', + historicalVersion:'历史版本', + versionName:'版本名称', + finalizationTime:'定版时间', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index b1c26d5d1..240cc8cf9 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -9,6 +9,20 @@ {{this.title}} +
+
+ + {{$t('comment')}} +
+
+ + {{$t('historicalVersion')}} +
+
+ + {{$t('UpdateLog')}} +
+
@@ -43,6 +57,8 @@
+ + @@ -52,6 +68,8 @@ import ProjectDetailsName from '../components/ProjectDetails' import TaskParameterCollection from '../components/TaskParameterCollection' import nonConformance from '../components/nonConformance' + import updateLog from '@/components/UpdateLog/index' + import historicalVersionList from '../components/historicalVersionList' export default { name: 'ProjectDetails', @@ -60,12 +78,18 @@ listOfRegulations, ProjectDetailsName, TaskParameterCollection, - nonConformance + nonConformance, + updateLog, + historicalVersionList }, data() { return { title: this.$t('projectDetails'), - textTitle: '项目详情' + textTitle: '项目详情', + url: { + logList: '', + historicalVersionUrl: '' + } } }, mounted() { @@ -90,6 +114,12 @@ } let text = document.getElementsByClassName('Virtual-detail-left-text') text[num].classList.add('Virtual-detail-left-text-color') + }, + UpdateLogClick() { + this.$refs.updateLogRef.getList() + }, + historicalVersionClick() { + this.$refs.historicalVersionListRef.getList() } } } @@ -161,4 +191,8 @@ background: #eff1f3; border-radius: 4px; } + + .Virtual-detail-text-right { + + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue new file mode 100644 index 000000000..372d5d7ae --- /dev/null +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -0,0 +1,123 @@ + + + + + \ 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 1275699fc..fc2ed2055 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -256,14 +256,6 @@ data() { return { columns: [ - { - title: 'WVTA ID', - align: 'center', - dataIndex: 'wvtaId', - width: 100, - ellipsis: true, - fixed: 'left' - }, { title: this.$t('standard'), align: 'center', @@ -329,6 +321,12 @@ ellipsis: true, dataIndex: 'implementTime' }, + { + title: 'WVTA ID', + align: 'center', + dataIndex: 'wvtaId', + ellipsis: true + }, { title: this.$t('certificationType'), align: 'center',