1
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-07-31 10:53:42 +08:00
parent c3955dc017
commit 7f8d08032c
1 changed files with 14 additions and 21 deletions

View File

@ -621,12 +621,9 @@ export default {
this.studyIndex = studyIndex this.studyIndex = studyIndex
this.seriesIndex = seriesIndex this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
<<<<<<< HEAD
var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
=======
// var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex]) var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex])
>>>>>>> uat
dicomStatck.imageIdIndex = 0 dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck) this.$emit('loadImageStack', dicomStatck)
if (!series.loadStatus && series.modality !== 'SR') { if (!series.loadStatus && series.modality !== 'SR') {
@ -677,11 +674,7 @@ export default {
} }
} else { } else {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
<<<<<<< HEAD
} }
=======
}
>>>>>>> uat
this.studyIndex = studyIndex this.studyIndex = studyIndex
this.seriesIndex = seriesIndex this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData