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

部分问题修复
continuous-integration/drone/push Build is passing Details

uat
wangxiaoshuang 2025-04-30 13:43:23 +08:00
parent 3551a521c8
commit d12b4adb68
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
View File

@ -214,15 +214,16 @@
<svg-icon icon-class="refresh" class="svg-icon" /> <svg-icon icon-class="refresh" class="svg-icon" />
</div> </div>
<!-- 更多 --> <!-- 更多 -->
<div v-if="criterionType === 0" class="tool-item" :title="$t('trials:reading:button:more')" <div v-if="criterionType === 0" :title="$t('trials:reading:button:more')"
@click.stop="showPanel($event)" @mouseleave="toolMouseout"> @click.stop="showPanel($event)" @mouseleave="toolMouseout"
:class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']">
<div class="dropdown"> <div class="dropdown">
<div class="icon" data-tool="more"> <div class="icon" data-tool="more">
<svg-icon icon-class="more" class="svg-icon" /> <svg-icon icon-class="more" class="svg-icon" />
<i class="el-icon-arrow-down" style="color:#fff;" /> <i class="el-icon-arrow-down" style="color:#fff;" />
</div> </div>
<div class="dropdown-content"> <div class="dropdown-content">
<ul style="width:100px;"> <ul style="width:100px;" v-if="readingTaskState < 2">
<li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;"> <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
<a href="#" @click.prevent="setMoreToolActive(i.toolName)"> <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
{{ $t(i.i18nKey) }} {{ $t(i.i18nKey) }}
@ -257,7 +258,7 @@
@click="setColorMap(colorMap)"> @click="setColorMap(colorMap)">
<canvas :id="`colorBarCanvas${index}`" /> <canvas :id="`colorBarCanvas${index}`" />
<span style="margin-left:5px;font-size: 10px;">{{ colorMap <span style="margin-left:5px;font-size: 10px;">{{ colorMap
}}</span> }}</span>
</li> </li>
</ul> </ul>
@ -469,7 +470,7 @@
<el-form-item style="text-align:right;"> <el-form-item style="text-align:right;">
<!-- 取消 --> <!-- 取消 -->
<el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel')
}}</el-button> }}</el-button>
<!-- 确认 --> <!-- 确认 -->
<el-button type="primary" size="mini" @click="handleSubmitFusionSeries"> <el-button type="primary" size="mini" @click="handleSubmitFusionSeries">
{{ $t('common:button:confirm') }}</el-button> {{ $t('common:button:confirm') }}</el-button>
@ -718,7 +719,8 @@ export default {
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
if (this.criterionType === 0) { if (this.criterionType === 0) {
this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList) this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
this.customizeStandards = [...config.customizeStandards] let toolNames = this.tools.map(i => i.toolName)
this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
} else { } else {
this.tools = getTools(this.criterionType) this.tools = getTools(this.criterionType)
} }
@ -1313,15 +1315,15 @@ export default {
const nFrames = instance.NumberOfFrames || 0 const nFrames = instance.NumberOfFrames || 0
if (nFrames === 0) { if (nFrames === 0) {
// 单帧 // 单帧
stack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`) stack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}`)
} else { } else {
// 多帧 // 多帧
for (let i = 0; i < nFrames; i++) { for (let i = 0; i < nFrames; i++) {
const newImageId = `wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}&frame=${i + 1}` const newImageId = `wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&frame=${i + 1}`
stack.push(newImageId) stack.push(newImageId)
} }
} }
imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`) imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}`)
this.instanceInfo[instance.Id] = { taskIndex, studyIndex, seriesIndex } this.instanceInfo[instance.Id] = { taskIndex, studyIndex, seriesIndex }
} }
}) })
@ -1341,12 +1343,12 @@ export default {
keyImages.forEach(instance => { keyImages.forEach(instance => {
if (instance.KeyFramesList.length > 0) { if (instance.KeyFramesList.length > 0) {
instance.KeyFramesList.map(i => { instance.KeyFramesList.map(i => {
keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}&frame=${i}`) keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&frame=${i}`)
}) })
} else { } else {
keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`) keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}`)
} }
keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`) keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}`)
}) })
res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].ImageIds = keyImageIds res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].ImageIds = keyImageIds
res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].Stack = keyStack res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].Stack = keyStack
@ -1625,8 +1627,6 @@ export default {
annotation.data.text = markName annotation.data.text = markName
} }
this.saveCustomAnnotation(annotation) this.saveCustomAnnotation(annotation)
} else {
this.removeAnnotation(annotation)
} }
} }
@ -1641,7 +1641,7 @@ export default {
try { try {
const measureData = Object.assign({}, annotation) const measureData = Object.assign({}, annotation)
const params = {} const params = {}
params.VisitTaskId = annotation.visitTaskId params.VisitTaskId = this.taskInfo.VisitTaskId
params.StudyId = annotation.studyId params.StudyId = annotation.studyId
params.SeriesId = annotation.seriesId params.SeriesId = annotation.seriesId
params.InstanceId = annotation.instanceId params.InstanceId = annotation.instanceId
@ -2504,14 +2504,12 @@ export default {
async getScreenshots(measureData, callback) { async getScreenshots(measureData, callback) {
if (measureData) { if (measureData) {
await this.imageLocation(measureData) await this.imageLocation(measureData)
setTimeout(async () => { const divForDownloadViewport = document.querySelector(
const divForDownloadViewport = document.querySelector( `div[data-viewport-uid="viewport-${this.activeViewportIndex}"]`
`div[data-viewport-uid="viewport-${this.activeViewportIndex}"]` )
) const canvas = await html2canvas(divForDownloadViewport)
const canvas = await html2canvas(divForDownloadViewport) const base64Str = canvas.toDataURL('image/png', 1)
const base64Str = canvas.toDataURL('image/png', 1) callback(base64Str)
callback(base64Str)
}, 50)
} else { } else {
callback() callback()
} }
@ -3194,7 +3192,8 @@ export default {
} }
.content-wrapper { .content-wrapper {
flex: 1 0 0%; flex: 1;
height: calc(100% - 50px);
display: flex; display: flex;
flex-direction: row; flex-direction: row;
height: 90%; height: 90%;
@ -3232,7 +3231,7 @@ export default {
width: 400px; width: 400px;
height: 100%; height: 100%;
border: 1px solid #727272; border: 1px solid #727272;
overflow-y: auto; // overflow-y: auto;
user-select: none; user-select: none;
} }
} }

3
src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
View File

@ -244,6 +244,9 @@ export default {
this.imageInfo.location = imagePlaneModule.sliceLocation this.imageInfo.location = imagePlaneModule.sliceLocation
this.getOrientationMarker() this.getOrientationMarker()
this.$emit('renderAnnotations', this.series) this.$emit('renderAnnotations', this.series)
// const toolGroupId = `viewport-${this.viewportIndex}`
// const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
// toolGroup.setToolEnabled('ScaleOverlay')
} }
}, },