diff --git a/src/views/blindResumeInfo/components/BasicInfo.vue b/src/views/blindResumeInfo/components/BasicInfo.vue index 1574e6bf..59634c8c 100644 --- a/src/views/blindResumeInfo/components/BasicInfo.vue +++ b/src/views/blindResumeInfo/components/BasicInfo.vue @@ -21,7 +21,7 @@ - {{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }} + {{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }} {{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }} diff --git a/src/views/blindResumeInfo/components/ResearchPublication.vue b/src/views/blindResumeInfo/components/ResearchPublication.vue index e4ee38ef..a26135ee 100644 --- a/src/views/blindResumeInfo/components/ResearchPublication.vue +++ b/src/views/blindResumeInfo/components/ResearchPublication.vue @@ -76,7 +76,15 @@ export default { researchInfo: { type: Object, default() { - return {} + return { + Research: null, + ResearchCN: null, + Grants: null, + GrantsCN: null, + Publications: null, + AwardsHonors: null, + AwardsHonorsCN: null + } } }, isEnglish: { diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue index 05b3d9a8..330ed38a 100644 --- a/src/views/blindResumeInfo/info.vue +++ b/src/views/blindResumeInfo/info.vue @@ -90,6 +90,7 @@ export default { this.setLanguage('zh') this.$updateDictionary() } + this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}` } }, mounted() { @@ -177,6 +178,7 @@ 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() diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 2426b687..7a991e1f 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -156,7 +156,7 @@ export default { showSeriesList: [] } }, - created: function() { + created() { this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : '' this.visitNum = this.$router.currentRoute.query.visitNum ? parseInt(this.$router.currentRoute.query.visitNum) : 0 @@ -176,6 +176,28 @@ export default { this.loadStudy() } else if (this.type === 'Share') { this.loadStudy() + try { + this.type = this.$route.query.type ? this.$route.query.type : '' + this.visitNum = this.$router.currentRoute.query.visitNum ? parseInt(this.$router.currentRoute.query.visitNum) : 0 + cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded) + // cornerstone.events.addEventListener('datasetscachechanged', this.datasetsCacheChanged) + if (this.$router.currentRoute.query.TokenKey) { + store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey) + changeURLStatic('TokenKey', '') + } + this.studyId = this.$router.currentRoute.query.studyId + if (this.type === 'Series') { + // this.initStudy() + this.showDelete = parseInt(this.$router.currentRoute.query.showDelete) + this.initSeries() + } else if (this.type === 'Study') { + this.showDelete = parseInt(this.$router.currentRoute.query.showDelete) + this.loadStudy() + } else if (this.type === 'Share') { + this.loadStudy() + } + } catch (e) { + console.log(e) } }, beforeDestroy() { @@ -248,55 +270,59 @@ export default { }) }, initSeries() { - var scope = this - this.studyCode = this.$router.currentRoute.query.studyCode - this.modality = this.$router.currentRoute.query.modality - this.seriesCount = 1 - this.description = this.$router.currentRoute.query.description - var seriesId = this.$router.currentRoute.query.seriesId - var seriesNumber = this.$router.currentRoute.query.seriesNumber - var subjectVisitId = this.$router.currentRoute.query.subjectVisitId - var studyId = this.$router.currentRoute.query.studyId - var trialId = this.$router.currentRoute.query.trialId - getInstanceList(seriesId).then(res => { - if (!res.Result || (res.Result && res.Result.length === 0)) return - var seriesInstanceUid = res.Result[0].SeriesInstanceUid - var sliceLocation = res.Result[0].SliceLocation - var isReading = res.Result[0].IsReading - var isDeleted = res.Result[0].IsDeleted - var seriesList = [] - var imageIds = [] - res.Result.forEach(instance => { - imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`) - }) - seriesList.push({ - trialId, - subjectVisitId, - studyId, - imageIds: imageIds, - seriesId: seriesId, - seriesUid: seriesInstanceUid, - seriesNumber: seriesNumber, - sliceThickness: sliceLocation, - modality: this.modality, - description: this.description, - isReading, - isDeleted, - previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath, - instanceCount: res.Result.length, - prefetchInstanceCount: 0, - loadStatus: false, - imageloadedArr: [] - }) - this.seriesList = seriesList - if (this.seriesList.length > 0) { - this.$nextTick(() => { - this.loadAllImages() - this.$refs.dicomViewer.loadImageStack(this.seriesList[0]) - this.firstInstanceId = this.seriesList[0].imageIds[0] + try { + console.log(0) + var scope = this + this.studyCode = this.$router.currentRoute.query.studyCode + this.modality = this.$router.currentRoute.query.modality + this.seriesCount = 1 + this.description = this.$router.currentRoute.query.description + var seriesId = this.$router.currentRoute.query.seriesId + var seriesNumber = this.$router.currentRoute.query.seriesNumber + var subjectVisitId = this.$router.currentRoute.query.subjectVisitId + var studyId = this.$router.currentRoute.query.studyId + var trialId = this.$router.currentRoute.query.trialId + console.log(1) + getInstanceList(seriesId).then(res => { + if (!res.Result || (res.Result && res.Result.length === 0)) return + var seriesInstanceUid = res.Result[0].SeriesInstanceUid + var sliceLocation = res.Result[0].SliceLocation + var isReading = res.Result[0].IsReading + var isDeleted = res.Result[0].IsDeleted + var seriesList = [] + var imageIds = [] + res.Result.forEach(instance => { + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`) }) - } - }) + seriesList.push({ + trialId, + subjectVisitId, + studyId, + imageIds: imageIds, + seriesId: seriesId, + seriesUid: seriesInstanceUid, + seriesNumber: seriesNumber, + sliceThickness: sliceLocation, + modality: this.modality, + description: this.description, + isReading, + isDeleted, + previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath, + instanceCount: res.Result.length, + prefetchInstanceCount: 0, + loadStatus: false, + imageloadedArr: [] + }) + this.seriesList = seriesList + if (this.seriesList.length > 0) { + this.$nextTick(() => { + this.loadAllImages() + this.$refs.dicomViewer.loadImageStack(this.seriesList[0]) + this.firstInstanceId = this.seriesList[0].imageIds[0] + }) + } + }) + } catch (e) {console.log(e)} }, showSeriesImage(e, seriesIndex, series) { // if (seriesIndex === this.currentSeriesIndex) return diff --git a/src/views/resumeInfo/components/BasicInfo.vue b/src/views/resumeInfo/components/BasicInfo.vue index b289de67..f20e8a81 100644 --- a/src/views/resumeInfo/components/BasicInfo.vue +++ b/src/views/resumeInfo/components/BasicInfo.vue @@ -34,7 +34,7 @@ - {{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }} + {{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }} {{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }} diff --git a/src/views/resumeInfo/components/ResearchPublication.vue b/src/views/resumeInfo/components/ResearchPublication.vue index ba10a320..a830e5ec 100644 --- a/src/views/resumeInfo/components/ResearchPublication.vue +++ b/src/views/resumeInfo/components/ResearchPublication.vue @@ -70,7 +70,15 @@ export default { researchInfo: { type: Object, default() { - return {} + return { + Research: null, + ResearchCN: null, + Grants: null, + GrantsCN: null, + Publications: null, + AwardsHonors: null, + AwardsHonorsCN: null + } } }, isEnglish: { diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue index 945b06ed..aee1c71e 100644 --- a/src/views/resumeInfo/index.vue +++ b/src/views/resumeInfo/index.vue @@ -30,7 +30,6 @@ - @@ -103,6 +102,7 @@ export default { this.setLanguage('zh') this.$updateDictionary() } + this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}` } }, mounted() { @@ -191,6 +191,7 @@ 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.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}` this.htmlTitle = this.title this.initStatus() diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue index 679af9fc..e2ccd666 100644 --- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue +++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue @@ -1592,14 +1592,18 @@ export default { }, // 预览某个序列 handlePreviewInstance(row) { - if (this.open) { - this.open.close() + try { + if (this.open) { + this.open.close() + } + var token = getToken() + const routeData = this.$router.resolve({ + path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId}&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${row.Id}&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1}&subjectVisitId=${this.data.Id}&type=Series&TokenKey=${token}&description=${row.Description}` + }) + this.open = window.open(routeData.href, '_blank') + } catch (e) { + console.log(e) } - var token = getToken() - const routeData = this.$router.resolve({ - path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId}&studyCode=${row.StudyCode}&modality=${row.Modality}&description=${row.Description}&seriesId=${row.Id}&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1}&subjectVisitId=${this.data.Id}&TokenKey=${token}&type=Series` - }) - this.open = window.open(routeData.href, '_blank') }, // 预览所有检查下非Dicom文件 handleViewAllNoneDicoms() {