XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
View File

@ -69,18 +69,18 @@
> >
<div class="frame_list"> <div class="frame_list">
<div <div
v-for="(instance, idx) in series.instanceInfoList" v-for="(instance, idx) in series.instanceInfoList"
:key="instance.Id" :key="instance.Id"
class="frame_content" class="frame_content"
:style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}" :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
@click.stop="showMultiFrames(index,series, i, instance)" @click.stop="showMultiFrames(index,series, i, instance)"
> >
<div> <div>
<div>{{ instance.InstanceNumber }}</div> <div>{{ instance.InstanceNumber }}</div>
<div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div> <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
</div> </div>
</div> </div>
</div> </div>
<i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" /> <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
</el-popover> </el-popover>
@ -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,16 +674,12 @@ 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
// 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])
dicomStatck.imageIds = imageIds dicomStatck.imageIds = imageIds
dicomStatck.imageIdIndex = 0 dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck) this.$emit('loadImageStack', dicomStatck)