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

uat
caiyiling 2025-04-28 16:12:02 +08:00
commit 5ebf9032a5
4 changed files with 664 additions and 398 deletions

View File

@ -75,7 +75,7 @@
{{ markers.left }} {{ markers.left }}
</div> </div>
<div v-if="isFusion" class="color_bar"> <div v-if="isFusion" class="color_bar">
<canvas id="colorBar_Canvas" /> <canvas :id="`colorBar_Canvas_${viewportId}`" />
<!-- <div id="colorBar_Canvas" /> --> <!-- <div id="colorBar_Canvas" /> -->
</div> </div>
<div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)"> <div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)">
@ -384,7 +384,7 @@ export default {
// }, // },
// }); // });
const rgbPoints = colorMap.RGBPoints const rgbPoints = colorMap.RGBPoints
const canvas = document.getElementById('colorBar_Canvas') const canvas = document.getElementById(`colorBar_Canvas_${this.viewportId}`)
const ctx = canvas.getContext('2d') const ctx = canvas.getContext('2d')
const canvasWidth = 160 const canvasWidth = 160
const canvasHeight = 5 const canvasHeight = 5
@ -433,9 +433,6 @@ export default {
if (this.series && obj.Id === this.series.Id && obj.Description === this.series.Description && !isLocate) { if (this.series && obj.Id === this.series.Id && obj.Description === this.series.Description && !isLocate) {
obj.SliceIndex = this.series.SliceIndex obj.SliceIndex = this.series.SliceIndex
} }
if (this.series) {
obj.cellType = this.series.cellType
}
this.series = {} this.series = {}
let { isFusion, isMip } = option let { isFusion, isMip } = option
this.isFusion = isFusion; this.isFusion = isFusion;

View File

@ -4,7 +4,7 @@
<!-- 阅片 --> <!-- 阅片 -->
<el-tab-pane v-if="taskInfo" :label="$t('trials:reading:tabTitle:review')" name="read"> <el-tab-pane v-if="taskInfo" :label="$t('trials:reading:tabTitle:review')" name="read">
<read-page v-if="!readingTool" ref="readPage" /> <read-page v-if="!readingTool" ref="readPage" />
<PetCtReadPage v-else-if="readingTool === 2" /> <PetCtReadPage v-else-if="readingTool === 2" ref="readPage" />
</el-tab-pane> </el-tab-pane>
<!-- 报告 --> <!-- 报告 -->
<el-tab-pane <el-tab-pane

View File

@ -66,7 +66,7 @@
</el-form-item> </el-form-item>
<!-- 测量工具 --> <!-- 测量工具 -->
<el-form-item <el-form-item
v-if="CriterionType === 0 && form.ReadingTool === 0 && form.ReadingVersionEnum === 1" v-if="CriterionType === 0 && (form.ReadingTool === 0 || form.ReadingTool === 2 ) && form.ReadingVersionEnum === 1"
:label="$t('trials:readingUnit:readingRules:title:measureTool')" :label="$t('trials:readingUnit:readingRules:title:measureTool')"
> >
<el-checkbox-group <el-checkbox-group