diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6199f3709..423f7bcbd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -421,6 +421,7 @@ module.exports = { MessageNotification: 'Message Notification', SeeMore: 'See More', OperationSuccessful: 'Operation Successful', + Intheexport: 'In The Export...', OperationFailed: 'Operation Failed', PersonnelSelection: 'Select ', EmployeeNumber: 'Employee ID', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2957a5ace..30aeaec72 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -426,6 +426,7 @@ module.exports = { MessageNotification: '消息通知', SeeMore: '查看更多', OperationSuccessful: '操作成功', + Intheexport: '导出中...', operationFailed: '操作失败', PersonnelSelection: '人员选择', EmployeeNumber: '员工号', diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index f82aea684..b4f513c54 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -3,7 +3,7 @@
- {{$t('ParameteItemCollectionList')}}(Model - year market)——{{$t(this.paramsManifest.title)}} + {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}})——{{$t(this.paramsManifest.title)}}
@@ -108,10 +108,10 @@ - + -
+
...{{ $t('more') }}
@@ -192,12 +198,7 @@ {{$t('CompulsoryWithdrawal')}}
- -
- - {{$t('export')}} -
+
{ + this.$message.success(this.$t('Intheexport')) + this.textLoading = false + }) }, // 高级搜索 handleSuperQuery(params, matchType) { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index d2cc97db2..e172375ac 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -255,7 +255,9 @@ localStorage.setItem('paramsManifest', JSON.stringify(item)) let newUrl = _this.$router.resolve({ path: '/ParameterItemCollection', - query: item + query: item + // projectName:this.$route.query.projectName + }) window.open(newUrl.href, '_blank') } else {