From 95d1207a4552e02f2680896a0211566fc40133b4 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 27 Feb 2024 14:02:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue index 68fc9234..cfe8d025 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue @@ -727,12 +727,7 @@ export default { if (!valid) return if (!this.isInsideVolume) { this.$alert('当前标记在图像外，不允许保存！', '提示', { - callback: action => { - this.$message({ - type: 'info', - message: `action: ${action}` - }) - } + callback: action => {} }) return } From 6eb8957d1c5598c4f779d114fbe1c72dc989219d Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 27 Feb 2024 14:05:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue index cfe8d025..a1841d85 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue @@ -726,7 +726,12 @@ export default { this.$refs.measurementForm.validate(async valid => { if (!valid) return if (!this.isInsideVolume) { - this.$alert('当前标记在图像外，不允许保存！', '提示', { + // this.$alert('当前标记在图像外，不允许保存！', '提示', { + // callback: action => {} + // }) + this.$confirm(this.$t('当前标记在图像外，不允许保存！'), { + type: 'warning', + showCancelButton: false, callback: action => {} }) return From 30c411d03fddaddd18ae9e61e859119ed176b488 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 27 Feb 2024 15:01:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dicoms/components/Fusion/QuestionItem.vue | 16 +++++++++++++--- .../dicoms/components/Fusion/Questions.vue | 5 +++++ .../components/Fusion/TableQuestionItem.vue | 8 ++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue index 3374aeb2..0a1ebb29 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue @@ -33,12 +33,12 @@ - {{ $t('trials:lugano:button:addAnnotation') }} + {{ $t('trials:lugano:button:addAnnotation') }} - {{ $t('trials:lugano:button:clearAnnotation') }} + {{ $t('trials:lugano:button:clearAnnotation') }} { if (!valid) return + const loading = this.$loading({ fullscreen: true }) if (!this.isInsideVolume) { // this.$alert('当前标记在图像外，不允许保存！', '提示', { // callback: action => {} // }) + loading.close() this.$confirm(this.$t('当前标记在图像外，不允许保存！'), { type: 'warning', showCancelButton: false, callback: action => {} }) + return } // 消失、无法评估状态的病灶限制不能测量SUV值 var lesionState = this.getQuestionVal(7) if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) { + loading.close() this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), { type: 'warning', showCancelButton: false, @@ -750,6 +754,7 @@ export default { if (this.questionForm.OtherMeasureData) { var suvmax = this.getQuestionVal(20) if (suvmax === 0) { + loading.close() this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), { type: 'warning', showCancelButton: false, @@ -759,7 +764,6 @@ export default { } } - const loading = this.$loading({ fullscreen: true }) var otherMeasureData = this.questionForm.OtherMeasureData ? Object.assign({}, this.questionForm.OtherMeasureData) : null if (otherMeasureData) { for (const k in otherMeasureData.data.cachedStats) { From 1b905f1f9dbc02b5fe7181b3a1d8d786696dc766 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 27 Feb 2024 15:10:41 +0800 Subject: [PATCH 4/5] 1 --- .../trials-panel/reading/dicoms/components/Fusion/Questions.vue | 1 - 1 file changed, 1 deletion(-) 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 bad39d51..1b6eabbc 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 @@ -289,7 +289,6 @@ export default { }, removeAnnotation(obj) { - console.log('question_removeAnnotation') const { Id } = obj var idx = this.measurements.findIndex(i => i.QuestionId === Id) if (idx === -1) return From 29e535a10a83b6e2a3c162fe8f9f537dc54823d9 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 27 Feb 2024 15:42:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue index 7cb8c264..faeba76e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue @@ -880,6 +880,7 @@ export default { } var suvMax = this.getQuestionVal(20) this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers }) + this.isInsideVolume = true }) .catch(() => {}) }, @@ -915,6 +916,7 @@ export default { } var suvMax = this.getQuestionVal(20) this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers }) + this.isInsideVolume = true }, handleDelete() { // 是否确认删除？