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

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2026-03-30 14:14:18 +08:00
parent aae5968d74 79a7ad0cf7
commit 0dbd74270d
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
View File

@ -894,6 +894,9 @@ export default {
DicomEvent.$on('addNoneDicomMeasureData', data => { DicomEvent.$on('addNoneDicomMeasureData', data => {
this.open.postMessage({ type: 'addNoneDicomMeasureData', data: data }, window.location) this.open.postMessage({ type: 'addNoneDicomMeasureData', data: data }, window.location)
}) })
DicomEvent.$on('activeSeries', (series) => {
this.renderedTaskIds = []
})
document.addEventListener("click", this.foo); document.addEventListener("click", this.foo);
this.getSystemInfoReading(); this.getSystemInfoReading();
}, },
@ -1607,16 +1610,17 @@ export default {
const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === taskId) const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === taskId)
if (taskIdx === -1) return if (taskIdx === -1) return
const annotations = this.visitTaskList[taskIdx].Annotations const annotations = this.visitTaskList[taskIdx].Annotations
console.log(annotations, 'annotations')
annotations.map(i => { annotations.map(i => {
if (i.MeasureData && !Object.hasOwn(i.MeasureData, 'isDicomReading')) { if (i.MeasureData && !Object.hasOwn(i.MeasureData, 'isDicomReading')) {
const annotation = i.MeasureData const annotation = i.MeasureData
if ((this.readingTool === 3 && annotation.seriesId === series.Id) || this.readingTool < 3) {
annotation.highlighted = false annotation.highlighted = false
cornerstoneTools.annotation.state.addAnnotation(annotation) cornerstoneTools.annotation.state.addAnnotation(annotation)
if (this.visitTaskList[taskIdx].ReadingTaskState === 2) { if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID) cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
} }
} }
}
}) })
}, },
addAnnotationListeners() { addAnnotationListeners() {

2
src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
View File

@ -827,7 +827,6 @@ export default {
}, },
async customPrompt() { async customPrompt() {
try { try {
console.log(annotation.state.getAllAnnotations(), 'annotation.state.getAllAnnotations()')
const that = this const that = this
// 请输入标记名称 // 请输入标记名称
let message = this.$t('trials:reading:Segmentations:message:rename') let message = this.$t('trials:reading:Segmentations:message:rename')
@ -1139,7 +1138,6 @@ export default {
if (toolName === 'ThresholdSphere') { if (toolName === 'ThresholdSphere') {
this.setDynamicRadius() this.setDynamicRadius()
} }
console.log(this.brushThreshold.dynamicRadius, 'this.brushThreshold.dynamicRadius')
}, },
setDynamicRadius() { setDynamicRadius() {
let volume = cache.getVolume(this.series.SeriesInstanceUid); let volume = cache.getVolume(this.series.SeriesInstanceUid);

13
src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
View File

@ -282,13 +282,12 @@ export default {
this.imageInfo.location = imagePlaneModule.sliceLocation this.imageInfo.location = imagePlaneModule.sliceLocation
this.imageInfo.total = detail.numberOfSlices this.imageInfo.total = detail.numberOfSlices
this.getOrientationMarker() this.getOrientationMarker()
if (this.series && this.series.Id) {
let annotations = cornerstoneTools.annotation.state.getAllAnnotations().filter(item => item.metadata.toolName !== 'ScaleOverlay' && item.metadata.volumeId !== this.volumeId && !item.metadata.segmentationId) let annotations = cornerstoneTools.annotation.state.getAllAnnotations().filter(item => item.metadata.toolName !== 'ScaleOverlay' && item.metadata.volumeId !== this.volumeId && !item.metadata.segmentationId && item.seriesId !== this.series.Id)
// console.log(annotations, 'annotations')
annotations.forEach(item => { annotations.forEach(item => {
cornerstoneTools.annotation.state.removeAnnotation(item.annotationUID) cornerstoneTools.annotation.state.removeAnnotation(item.annotationUID)
}) })
}
this.$emit('renderAnnotations', this.series) this.$emit('renderAnnotations', this.series)
let properties = viewport.getProperties() let properties = viewport.getProperties()
if (this.isFusion) { if (this.isFusion) {
@ -503,8 +502,8 @@ export default {
if (cache.getVolume(volumeId)) { if (cache.getVolume(volumeId)) {
volume = cache.getVolume(volumeId) volume = cache.getVolume(volumeId)
} else { } else {
await this.createImageIdsAndCacheMetaData(serie) let imageIds = await this.createImageIdsAndCacheMetaData(serie)
volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: serie.ImageIds }) volume = await volumeLoader.createAndCacheVolume(volumeId, { imageIds: imageIds })
volume.load() volume.load()
} }
res({ volumeId, volume }) res({ volumeId, volume })
@ -516,7 +515,7 @@ export default {
if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate && !data.isLocation) { if (this.series && data.Id === this.series.Id && data.Description === this.series.Description && !isLocate && !data.isLocation) {
data.SliceIndex = this.series.SliceIndex data.SliceIndex = this.series.SliceIndex
} }
// console.log(data.SliceIndex) // console.log(data)
const renderingEngine = getRenderingEngine(this.renderingEngineId) const renderingEngine = getRenderingEngine(this.renderingEngineId)
const viewport = renderingEngine.getViewport(this.viewportId) const viewport = renderingEngine.getViewport(this.viewportId)
if (isLocate) return csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex }); if (isLocate) return csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex });