diff --git a/.eslintignore b/.eslintignore
index 3ff12bc3..f8cee48b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
public
dist
-src/*
+# src/*
src/views/trials/trials-panel/visit/*
src/App.vue
src/views/trials/trials-panel/reading/global-review/*
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 13ccff38..01a8b054 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
@@ -2056,7 +2056,8 @@ export default {
},
startTimer() {
timerId = setTimeout(() => {
- this.$confirm('当前pet-ct图像融合耗时过长,是否继续等待?', '提示', {
+ // '当前pet-ct图像融合耗时过长,是否继续等待?'
+ this.$confirm(this.$t('trials:lugano:message:fusionMsg'), this.$t('trials:lugano:message:fusiontip'), {
type: 'warning'
}).then(() => {
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 444855bc..abbf12c5 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
@@ -742,7 +742,7 @@ export default {
// 普通靶病灶:长径大于10mm且不小于2倍层厚(基线校验)
// 淋巴结靶病灶:短径大于15mm且不小于2倍层厚(基线校验)
var picturePath = ''
- if (val) {
+ if (val && otherMeasureData) {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index ca847b76..5b536c3f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1962,7 +1962,7 @@ export default {
// 普通靶病灶:长径大于10mm且不小于2倍层厚(基线校验)
// 淋巴结靶病灶:短径大于15mm且不小于2倍层厚(基线校验)
var picturePath = ''
- if (val) {
+ if (val && measureData) {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
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 531f31f5..df0f19e8 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
@@ -190,19 +190,21 @@