suv部分问题解决
continuous-integration/drone/push Build is passing Details

uat
wangxiaoshuang 2025-05-12 14:58:07 +08:00
parent 2d155612e5
commit 122c76d9b2
2 changed files with 45 additions and 30 deletions

View File

@ -2,7 +2,7 @@
<el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
<!-- 任务名称 -->
<el-form-item :label="$t('trials:lugano:fusionDialog:label:taskBlindName')" prop="taskBlindName">
<el-select v-model="fusionForm.visitTaskId" clearable @change="handleTaskIdChange">
<el-select v-model="fusionForm.visitTaskId" clearable @change="handleTaskIdChange" disabled>
<el-option v-for="item in taskList" :key="item.VisitTaskId" :label="item.TaskBlindName"
:value="item.VisitTaskId" />
</el-select>

View File

@ -1468,11 +1468,11 @@ export default {
this.setToolsPassive()
},
async customAnnotationRemovedListener(e) {
if (this.readingTaskState === 2) return
const { annotation } = e.detail
if (!annotation) return
if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
try {
try{
if (!annotation) return false
if (this.readingTaskState === 2) throw 'annotation Not allowed to operate'
if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
if (this.activeTool === 'Eraser') {
await this.$confirm(
this.$t('trials:trials-list:table:isDeleted') +
@ -1493,16 +1493,18 @@ export default {
const viewport = renderingEngine.getViewport(viewportId)
viewport.render()
}
} catch (e) {
cornerstoneTools.annotation.state.addAnnotation(annotation)
const renderingEngine = getRenderingEngine(renderingEngineId)
for (let i = 0; i < this.cells.length; i++) {
const viewportId = `${this.viewportKey}-${i}`
const viewport = renderingEngine.getViewport(viewportId)
viewport.render()
}
console.log(e)
} else {
throw 'annotation Not allowed to operate'
}
}catch(e){
cornerstoneTools.annotation.state.addAnnotation(annotation)
const renderingEngine = getRenderingEngine(renderingEngineId)
for (let i = 0; i < this.cells.length; i++) {
const viewportId = `${this.viewportKey}-${i}`
const viewport = renderingEngine.getViewport(viewportId)
viewport.render()
}
console.log(e)
}
},
removeAnnotation(annotation) {
@ -2741,8 +2743,8 @@ export default {
if (!this.fusionSerieId.pt || this.fusionSerieId.pt !== pt.SeriesInstanceUid ) {
this.fusionSerieId.pt = pt.SeriesInstanceUid
}
await this.getVolume(ct)
await this.getVolume(pt)
await this.getVolume(ct)
await this.getVolume(pt, true)
this.loading = false
this.loadingText = null
@ -2788,22 +2790,35 @@ export default {
return false
},
async getVolume(serie, isFusion = false ) {
let volumeId = null, volume = null
let key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
if(!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
await this.$refs[`viewport-fusion-0`][0].createImageIdsAndCacheMetaData(serie)
volumeId = `${isFusion ? 'fusion' : serie.Modality}Volume` + ':' + csUtils.uuidv4()
volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
volume.load()
this.volumeData[key] = {}
this.volumeData[key].volumeId = volumeId
this.volumeData[key].volume = volume
} else {
volumeId = this.volumeData[key].volumeId
volume = this.volumeData[key].volume
}
return new Promise(async res => {
let volumeId = null, volume = null
let key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
if(!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
if ( serie.Modality === 'PT' && !isFusion ) {
serie.ImageIds.forEach(async id => {
const imageLoadObject = cache.getImage(id);
if (imageLoadObject) {
await new Promise(res => {
cache.removeImageLoadObject(id, {force:true}); //
res()
})
}
})
}
await this.$refs[`viewport-fusion-0`][0].createImageIdsAndCacheMetaData(serie)
volumeId = `${isFusion ? 'fusion' : serie.Modality}Volume` + ':' + csUtils.uuidv4()
volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds })
volume.load()
this.volumeData[key] = {}
this.volumeData[key].volumeId = volumeId
this.volumeData[key].volume = volume
} else {
volumeId = this.volumeData[key].volumeId
volume = this.volumeData[key].volume
}
return { volumeId, volume }
res({ volumeId, volume })
})
},
upperRangeChange(upper) {
this.$refs.colorMap.upper = upper