Compare commits

..

No commits in common. "93831ceb888d7a6711ff94840396726be9097b92" and "7581b430d61624bdb4ac081ea855b4174012c279" have entirely different histories.

6 changed files with 5 additions and 21 deletions

View File

@ -21,7 +21,7 @@
<el-col :span="6">
<el-form-item :label="$t('resumeInfo:label:Title')">
<span v-if="isEnglish">
{{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
{{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
</span>
<span v-else>
{{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }}

View File

@ -76,15 +76,7 @@ export default {
researchInfo: {
type: Object,
default() {
return {
Research: null,
ResearchCN: null,
Grants: null,
GrantsCN: null,
Publications: null,
AwardsHonors: null,
AwardsHonorsCN: null
}
return {}
}
},
isEnglish: {

View File

@ -177,7 +177,6 @@ export default {
if (res.Result) {
this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
this.doctorInfo = res.Result
!this.doctorInfo.ResearchPublicationView ? this.doctorInfo.ResearchPublicationView = {} : '';
this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
this.htmlTitle = this.title
this.initStatus()

View File

@ -34,7 +34,7 @@
<el-col :span="6">
<el-form-item :label="$t('resumeInfo:label:Title')">
<span v-if="isEnglish">
{{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
{{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
</span>
<span v-else>
{{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }}

View File

@ -70,15 +70,7 @@ export default {
researchInfo: {
type: Object,
default() {
return {
Research: null,
ResearchCN: null,
Grants: null,
GrantsCN: null,
Publications: null,
AwardsHonors: null,
AwardsHonorsCN: null
}
return {}
}
},
isEnglish: {

View File

@ -30,6 +30,7 @@
</el-collapse-item>
<el-collapse-item :title="$t('resumeInfo:title:Research&Publication')" name="5">
<research-publication :research-info="doctorInfo.ResearchPublicationView" :is-english="isEnglish" />
</el-collapse-item>
<el-collapse-item :title="$t('resumeInfo:title:TrialExperience')" name="6">
<trial-experience v-if="doctorInfo.TrialExperienceView" :trial-experience="doctorInfo.TrialExperienceView" :is-english="isEnglish" />