diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ac49fffa6..4b3f50416 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1122,7 +1122,7 @@ module.exports = { RelevantMaterials: 'RelevantMaterials', evaluatorFeedback: 'Evaluator Feedback', nameTechnicalDocument: 'Name of technical document', - chapter: 'chapter', + chapter: 'Chapter', problemDescription: 'Problem Description', filingExternalOpinions: 'Filing of external opinions', regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 26557fe06..1ba768a85 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -116,6 +116,7 @@ } }, mounted() { + document.title = 'Country Card'+ '-' + this.$t('details') this.queryCountry(() => { this.replacePage() }) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index b058c8943..80477ef65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -278,10 +278,12 @@ } }, mounted() { - document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') this.getBase() if (this.$route.query.id) { this.queryById() + document.title = this.$t('problemKnowledgeBase') + this.$t('edit') + } else { + document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') } }, methods: { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index d325f194d..674d582b4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -95,6 +95,7 @@ }, mounted() { this.getList() + document.title = this.$t('managePublishing') }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 67fae61f9..bc6735658 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -8,7 +8,7 @@ + v-model="queryParamOne.problem_type"> @@ -20,7 +20,7 @@
{{$t('market')}} - @@ -37,7 +37,7 @@
{{$t('searchScope')}}: - {{queryParamSeach}} + {{queryParam.selectValue}}
@@ -128,14 +128,14 @@ loading: false, fileList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', - queryParamSeach: '', mapOne: {}, mapTwo: {}, queryParamOne: {}, - searchQueryOne: {}, orderBy: '1', orderByField: '', - tagList: [] + tagList: [], + selectValue: '', + selectValueTwo: '' } }, watch: { @@ -180,86 +180,55 @@ } }, pageOnChange(page, pageSize) { - this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = page - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, SizeChange(page, pageSize) { - this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = 1 this.pageSize = pageSize - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, searchReset() { this.pageNo = 1 this.queryParamOne = {} - this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } - this.queryParamSeach = '' - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, searchQuery() { - this.ParamSeach() - this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = 1 - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, - ParamSeach() { - let queryParam = JSON.parse(JSON.stringify(this.searchQueryOne)) - if (queryParam[this.selectModel]) { - this.queryParamSeach = this.selectModelName + ':' + queryParam[this.selectModel] - } else { - this.queryParamSeach = '' - } - }, - searchData(data) { - this.queryParam = {} - this.searchQueryOne = data || {} - this.queryParam = { ...this.queryParamOne, ...data } - this.ParamSeach() + searchData(value) { + this.queryParam.selectValue = value || undefined + this.queryParam.selectValueTwo = undefined this.pageNo = 1 - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, - searchDataTwo(data) { - this.queryParam = {} - this.searchQueryOne = data || {} - this.queryParam = { ...this.queryParamOne, ...data } - this.ParamSeach() + searchDataTwo(value) { + this.queryParam.selectValueTwo = value this.pageNo = 1 - this.getParagraphInfoList(2) + this.getParagraphInfoList() }, ResetSearch() { this.queryParam = {} this.queryParamOne = {} - this.searchQueryOne = {} this.checkboxText = [] - this.selectedRowKeys = [] - this.ParamSeach() this.pageNo = 1 - this.getParagraphInfoList(1) + this.getParagraphInfoList() }, - getParagraphInfoList(num) { - let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + getParagraphInfoList() { + let queryParamOne = Object.assign(this.queryParam, this.queryParamOne) + let queryParam = JSON.parse(JSON.stringify(queryParamOne)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { queryParam[val] = queryParam[val].join(',') } - if (val.includes('_name')) { - delete queryParam[val] - } }) - this.mapTwo = {} - if (num == 1) { - this.mapOne = queryParam - } else if (num == 2) { - this.mapTwo = queryParam - let checkboxText = JSON.parse(JSON.stringify(this.checkboxText)) - this.mapTwo.ids = checkboxText.join(',') - } + let checkboxText = JSON.parse(JSON.stringify(this.checkboxText)) let query = { pageNo: this.pageNo, pageSize: this.pageSize, - mapOne: this.mapOne, - mapTwo: this.mapTwo + ids: checkboxText.join(','), + ...queryParam } this.loading = true postAction(this.url.getParagraphInfoList, query).then((res) => {