diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6178f5f41..d6a2427e1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1119,4 +1119,9 @@ module.exports = { chapter:'chapter', problemDescription:'Problem description', filingExternalOpinions:'Filing of external opinions', + regulatoryTechnicalEvaluationResults:'Regulatory technical evaluation results', + initiateProcessForCurrentStandard:'Initiate process for current standard', + engineerFeedbackResults:'Engineer feedback results', + fileExport:'File export', + feedbackTime:'Feedback 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 8a5cd55ea..182b67d00 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1022,6 +1022,7 @@ module.exports = { closingDate: '截止日期', viewProcess: '查看流程', evaluationResults: '评估结果', + regulatoryTechnicalEvaluationResults:'法规技术评估结果', Assessor:'评估人', collectionOfRegulatoryOpinions:'法规意见收集', collectionOfRegulatoryOpinionsProcess:'法规意见收集流程', @@ -1123,4 +1124,8 @@ module.exports = { chapter:'章节', problemDescription:'问题说明', filingExternalOpinions:'对外意见归档', + initiateProcessForCurrentStandard:'针对当前标准发起流程', + engineerFeedbackResults:'工程师反馈结果', + fileExport:'文件导出', + feedbackTime:'反馈时间', } \ 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 d2b7479b0..216d49f12 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -98,6 +98,8 @@ this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || this.$route.path == '/evaluationProcess' || + this.$route.path == '/evaluationResultsClause' || + this.$route.path == '/evaluationResultsWhole' || this.$route.path == '/evaluationInitiationProcess' || this.$route.path == '/historicalVersion' || this.$route.path == '/dashboard/analysis' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index b544ebd0b..648696c1d 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -347,6 +347,16 @@ export const constantRouterMap = [ name: 'evaluationInitiationProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess') }, + { + path: '/evaluationResultsWhole', + name: 'evaluationResultsWhole', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsWhole') + }, + { + path: '/evaluationResultsClause', + name: 'evaluationResultsClause', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsClause') + }, // { // path: '/ParameterItemCollection', // name: 'ParameterItemCollection', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index f4230edc3..61b515122 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -178,9 +178,9 @@ handleExport() { let query = { pageSize:this.pageSize, - pageNo:this.pageNo - // lawsOpinionGatherId: this.lawsOpinionGatherId, - // actiProcInstId: this.actiProcInstId + pageNo:this.pageNo, + lawsOpinionGatherId: this.lawsOpinionGatherId, + actiProcInstId: this.actiProcInstId } downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls', this.$t('evaluationResults') + '.zip', query) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue new file mode 100644 index 000000000..0b5fc24c9 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -0,0 +1,334 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue new file mode 100644 index 000000000..f645cc16e --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -0,0 +1,262 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 02f48cd6f..936c45306 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -92,9 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + {{$t('viewProcess')}} - {{$t('evaluationResults')}} @@ -186,11 +187,11 @@ whetherTobringList: [ { value: '1', - name: '是' + name: this.$t('yes') }, { value: '2', - name: '否' + name: this.$t('not') } ], gatherResultList: [ @@ -221,21 +222,21 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'technologyTerritory' + dataIndex: 'technologyTerritoryName' }, { title: this.$t('evaluationMethod'), align: 'center', width: 170, ellipsis: true, - dataIndex: 'evaluationMethods' + dataIndex: 'evaluationMethodsName' }, { title: this.$t('ProcessStatus'), align: 'center', width: 170, ellipsis: true, - dataIndex: 'flowStatus' + dataIndex: 'flowStatusName' }, { title: this.$t('dateOfInitiation'), @@ -363,7 +364,11 @@ window.open(newUrl.href, '_blank') }, evaluationResultsClick(row) { - this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row))) + let newUrl = this.$router.resolve({ + path: '/evaluationResultsWhole', + query: row + }) + window.open(newUrl.href, '_blank') } } }