From 195f927ff07d71b92849ce278ae13e4a79ef14c1 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 15 Jan 2024 17:30:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A5=E5=85=B7=E6=9D=A1=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Fusion/PetCt.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue index 6311f59c..e11fe70d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue @@ -181,7 +181,7 @@
@@ -2075,13 +2075,14 @@ export default { align-items: center; margin-right: 30px; .icon{ - padding: 5px; + padding: 0px; border: 1px solid #404040; cursor: pointer; text-align: center; .svg-icon{ - font-size:20px; + font-size:30px; color:#ddd; + padding: 2px; } } From d844e9b94935faf156a10eb9d22697b384d89771 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 16 Jan 2024 09:37:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E7=97=85=E7=81=B6=E6=88=AA=E5=9B=BE=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dicoms/components/Fusion/PetCt.vue | 23 +++-- .../dicoms/components/Fusion/Questions.vue | 18 ++-- .../dicoms/components/Lugano/QuestionForm.vue | 89 +++++++++++-------- 3 files changed, 75 insertions(+), 55 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue index e11fe70d..73b98b7f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue @@ -17,8 +17,9 @@ class="icon" :class="[activeTool==='WindowLevel'?'tool_active':'']" data-tool="WindowLevel" + @click.prevent="setBasicToolActive('WindowLevel')" > - +
@@ -60,8 +61,9 @@
- +
{{ $t('trials:reading:button:reverseColor') }}
@@ -74,8 +76,9 @@ class="icon" :class="[activeTool==='Zoom'?'tool_active':'']" data-tool="Zoom" + @click.prevent="setBasicToolActive('Zoom')" > - +
{{ $t('trials:reading:button:zoom') }}
@@ -88,8 +91,9 @@ class="icon" :class="[activeTool==='Pan'?'tool_active':'']" data-tool="Pan" + @click.prevent="setBasicToolActive('Pan')" > - +
{{ $t('trials:reading:button:move') }}
@@ -103,8 +107,9 @@ class="icon" :class="[activeTool==='Rotate'?'tool_active':'']" data-tool="Pan" + @click.prevent="setBasicToolActive('TrackballRotate')" > - + @@ -135,8 +140,9 @@ class="icon" :class="[activeTool===tool.toolName?'tool_active':'']" @mouseenter="enter($event,tool.toolName)" + @click.prevent="setMeasureToolActive(tool.toolName)" > - +
{{ tool.text }}
@@ -2075,14 +2081,13 @@ export default { align-items: center; margin-right: 30px; .icon{ - padding: 0px; + padding: 5px; border: 1px solid #404040; cursor: pointer; text-align: center; .svg-icon{ - font-size:30px; + font-size:25px; color:#ddd; - padding: 2px; } } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue index 0879d23c..97e4c7a8 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue @@ -53,8 +53,8 @@ export default { measurements: [], currentQsId: '', pet5PSId: '', - pet5PSCommentsId:'', - calculatePet5PS:null, + pet5PSCommentsId: '', + calculatePet5PS: null, liverSuvmaxId: '', lungSuvmaxId: '', suvmaxId: '', @@ -284,7 +284,7 @@ export default { } this.$emit('setNonTargetMeasurementStatus', { status: true, toolName: 'CircleROI' }) }, - + removeAnnotation(obj) { console.log('question_removeAnnotation') const { Id } = obj @@ -397,18 +397,18 @@ export default { }, setFormItemData(obj) { this.questionForm[obj.key] = obj.val - if(obj.key === this.pet5PSId){ + if (obj.key === this.pet5PSId) { this.setPet5PSCommentDisplay() } }, - setPet5PSCommentDisplay(){ - if( this.pet5PSCommentsId && this.pet5PSId ){ + setPet5PSCommentDisplay() { + if (this.pet5PSCommentsId && this.pet5PSId) { for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) { if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) { - if(this.calculatePet5PS && this.calculatePet5PS !== this.questionForm[this.pet5PSId]){ + if (this.calculatePet5PS && this.calculatePet5PS !== this.questionForm[this.pet5PSId]) { this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 0 this.questions[0].Childrens[0].Childrens[i].IsRequired = 0 - }else{ + } else { this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2 this.questions[0].Childrens[0].Childrens[i].IsRequired = 3 this.questionForm[this.pet5PSCommentsId] = '' @@ -443,7 +443,7 @@ export default { // 本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax 2分 // this.questionForm[this.pet5PSId] = '2' return '2' - }else{ + } else { // this.questionForm[this.pet5PSId] = '' return '' } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue index 9387578c..2faf5440 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue @@ -31,8 +31,8 @@ v-model="questionForm.LesionType" filterable :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask" - @change="((val)=>{lesionTypeChange(val)})" :popper-append-to-body="false" + @change="((val)=>{lesionTypeChange(val)})" > @@ -234,6 +242,7 @@ import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials' // import { uploadPrintscreen } from '@/api/reading' import DicomEvent from './../DicomEvent' import store from '@/store' +import Viewer from 'v-viewer' export default { name: 'MeasurementForm', props: { @@ -303,10 +312,11 @@ export default { pictureBaseStr: '', currentMarkTool: '', digitPlaces: 2, - stateDisabled: false, + stateDisabled: false } }, mounted() { + this.initializeViewer() this.trialId = this.$route.query.trialId this.initForm() DicomEvent.$on('handleImageQualityAbnormal', () => { @@ -319,6 +329,11 @@ export default { DicomEvent.$off('handleImageQualityAbnormal') }, methods: { + initializeViewer() { + Viewer.setDefaults({ + toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true } + }) + }, async initForm() { const loading = this.$loading({ fullscreen: true }) this.questions.forEach(item => {