diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9c6d5420c..ea00ab8e6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1160,4 +1160,5 @@ module.exports = {
turnOffAutomaticMatching:'Turn Off Automatic Matching',
Deriveconformanceresults:'Derive Conformance Results',
Regulatorycompliancekanban:'Regulatory Compliance Kanban',
+ exportComparisonReport:'Export Comparison Report',
}
\ 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 303b3ba6a..ace33b547 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1164,4 +1164,5 @@ module.exports = {
viewTheComparisonResults:'查看对比结果',
addFullTextComment:'添加全文评论',
turnOffAutomaticMatching:'关闭自动匹配',
+ exportComparisonReport:'导出对比报告',
}
\ No newline at end of file
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 042a5d153..3d15fba0b 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -98,6 +98,7 @@
this.$route.path == '/projectStatusAndProgress' ||
this.$route.path == '/TaskPlanList' ||
this.$route.path == '/documentDataComparison' ||
+ this.$route.path == '/comparisonResults' ||
this.$route.path == '/initiateDocumentComparison' ||
this.$route.path == '/evaluationProcess' ||
this.$route.path == '/evaluationResultsClause' ||
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index 2f59d7f5e..be6370596 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -392,6 +392,11 @@ export const constantRouterMap = [
name: 'documentDataComparison',
component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/documentDataComparison')
},
+ {
+ path: '/comparisonResults',
+ name: 'comparisonResults',
+ component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/comparisonResults')
+ },
{
path: '/handshakeProcess',
name: 'handshakeProcess',
diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
new file mode 100644
index 000000000..e5299048a
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
@@ -0,0 +1,185 @@
+
+
+
+
{{$t('dataLoading')}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index 6f9e548a4..8a0f581dd 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -261,7 +261,7 @@
},
initiatingProcessClick(){
let newUrl = this.$router.resolve({
- path: '/documentDataComparison',
+ path: '/comparisonResults',
})
window.open(newUrl.href, '_blank')
},
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 9b2c21bc9..5a20c86ad 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -3,7 +3,7 @@
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue
index 71e7e0c24..f75ab52eb 100644
--- a/jero-web/src/views/projectManagement/dialog/configure.vue
+++ b/jero-web/src/views/projectManagement/dialog/configure.vue
@@ -226,7 +226,8 @@
if (res.success) {
this.conFlag = res.result
if (this.conFlag == true) {
- this.paramsConfigEOList.splice(item.displaySeq + 1, 0, {
+ console.log(this.paramsConfigEOList)
+ this.paramsConfigEOList.splice(this.paramsConfigEOList.length + 1, 0, {
id: '',
configName: '', // 配置名称
version: '', // 版本
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index dfb8fca3d..0c3cf5453 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -12,7 +12,7 @@
-
@@ -20,10 +20,10 @@
-
-
- {{element.label}}
+
+ {{element.projectName}}
@@ -195,9 +195,16 @@ export default {
},
mounted() {
this.loadData()
- console.log(this.item)
+ this.getRelatedItemList()
},
methods: {
+ getRelatedItemList(){
+ getAction('/project/projectNameInfoEO/list', {}).then((res) => {
+ if (res.success) {
+ this.RelatedItemList = res.result
+ }
+ })
+ },
// 清单列表传出数据
listVisibleRow(val) {
this.selectedRowKeys = []
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 05301cc18..33a4a91ba 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -277,6 +277,7 @@ export default {
deriveconformanceresults(){
let query = {
...this.queryParam,
+ exportAll:'yes',
ids: this.selectedRowKeys.join(',')
}
downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)