diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bd059005d..446ed7756 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1312,4 +1312,7 @@ module.exports = { firstLevelDirectory:'First level directory', deselectAll:'Deselect All', classification:'Classification', + consistentAssessment:'Consistent assessment', + viewConsistentAssessment:'View Consistent Assessment', + viewAll:'View All', } \ 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 fa7a71a7c..c587adabc 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1413,4 +1413,7 @@ module.exports = { firstLevelDirectory:'一级目录', deselectAll:'取消全选', classification:'分类', + consistentAssessment:'一致评估', + viewConsistentAssessment:'查看一致评估', + viewAll:'查看全部', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index ace3619da..d989005a2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -53,72 +53,6 @@ - -
-
- {{$t('vehicleType')}} -
- - - -
- - - - -
-
- {{$t('scopeOfApplication')}} -
- - - -
- - -
-
- {{$t('status')}} -
- - - -
- - - - -
-
- {{$t('usage')}} -
- - - -
-
@@ -133,6 +67,72 @@
+ + + + + + + + + + + + + + + + + + +
+
+ {{$t('scopeOfApplication')}} +
+ + + +
+ + + + +
+
+ {{$t('status')}} +
+ + + +
+ + + + +
+
+ {{$t('usage')}} +
+ + + +
+ @@ -516,4 +516,7 @@ margin-bottom: 40px; } + .itemModel-multi-one { + border: 1px solid #d9d9d9; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 2a792a313..0b3afea18 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -262,21 +262,21 @@ itemNum: res.items_num, itemName: res.items_name, itemContent: res.iterms_conditions, - zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || '' + display_seq: res.display_seq || '' }) }) } this.dataList = this.ImportFileData.concat(this.dataListData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, getPersonnelList(res) { this.ImportFileData = this.ImportFileData.concat(res) this.dataList = this.dataListData.concat(this.ImportFileData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 6a5255d8c..4d0b38763 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -105,7 +105,10 @@
- {{$t('preservation')}} + {{$t('consistentAssessment')}} + + {{$t('preservation')}}
@@ -194,6 +197,51 @@ path: '/documentComparison' }) }, + consistentAssessmentClick() { + if (!this.dataLeft.id && !this.dataRight.id) { + this.$message.warning(this.$t('pleaseSelectTheDataCompared')) + return + } + let query = { + itemsIdLeft: this.dataLeft.id, + itemsIdRight: this.dataRight.id, + infoId: this.$route.query.id, + comment: '一致' + } + this.dataLoadingText = this.$t('pleaseWaitWhileRunning') + this.loading = true + postAction('/compare/sarFileCompareItemComment/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + this.formInline = {} + this.resultData.textRight.forEach(val => { + if (val.id == this.dataRight.id) { + val.reviewed = 1 + } + }) + this.resultData.textLeft.forEach(val => { + if (val.id == this.dataLeft.id) { + val.reviewed = 1 + } + }) + this.resultData = { ...this.resultData } + let detailLeftColor = document.getElementsByClassName('detail-content-content-right-data-color') + if (detailLeftColor && detailLeftColor.length > 0) { + detailLeftColor[0].classList.remove('detail-content-content-right-data-color') + } + let detailRightColor = document.getElementsByClassName('detail-content-content-right-data-color-right') + if (detailRightColor && detailRightColor.length > 0) { + detailRightColor[0].classList.remove('detail-content-content-right-data-color-right') + } + this.dataLeft = {} + this.dataRight = {} + } else { + this.$message.warning(this.$t('operationFailed')) + this.loading = false + } + }) + }, submit() { if (!this.dataLeft.id && !this.dataRight.id) { this.$message.warning(this.$t('pleaseSelectTheDataCompared'))