diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 90c9ec44..b03f87ec 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -1909,7 +1909,11 @@ export default { } }, handleCTSelectionChange(rows) { - this.ctSeriesInfo = rows[0] + if (rows.length > 0) { + this.ctSeriesInfo = rows[0] + } else { + this.ctSeriesInfo = {} + } }, handleCTSelect(selection) { if (selection.length > 1) { @@ -1924,7 +1928,11 @@ export default { } }, handlePTSelectionChange(rows) { - this.petSeriesInfo = rows[0] + if (rows.length > 0) { + this.petSeriesInfo = rows[0] + } else { + this.petSeriesInfo = {} + } }, handleSubmitFusionSeries() { this.$refs['fusionForm'].validate((valid) => { 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..36bba668 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 @@ -177,32 +177,61 @@ {{ val }} - - - + + - -
- Image -
{ @@ -1546,7 +1579,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/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue index 4b8c07df..f1995d9f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue @@ -692,7 +692,7 @@ export default { const loading = this.$loading({ fullscreen: true }) DicomEvent.$emit('getScreenshots', async val => { 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/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue index 11ae0df8..536f8618 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue @@ -1324,7 +1324,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/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue index c83e02a8..9d1005c2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue @@ -972,7 +972,7 @@ export default { DicomEvent.$emit('getScreenshots', async val => { 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/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue index bab2ddc5..a3bb3d83 100644 --- a/src/views/trials/trials-panel/reading/oncology-review/index.vue +++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue @@ -368,7 +368,8 @@ export default { if (isDiffer) { this.loading = false // '肿瘤学阅片结论不能为空!' this.$t('trials:oncologyReview:message:msg1' - this.$confirm('肿瘤学阅片结果与影像学整体肿瘤评估不一致,请填写原因!', { + // '肿瘤学阅片结果与影像学整体肿瘤评估不一致,请填写原因!' + this.$confirm(this.$t('trials:oncologyReview:message:msg2'), { type: 'warning', distinguishCancelAndClose: true }) diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue index 653e11b0..c478cc06 100644 --- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue +++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue @@ -289,8 +289,33 @@ :close-on-click-modal="false" custom-class="base-dialog-wrapper" > -
- {{ lookText }} +
+
+ {{$t('trials:uploadDicomList:table:FailedNumber')}}: {{lookText.Failed.length}} + {{$t('trials:uploadDicomList:table:ExistedNumber')}}: {{lookText.Existed.length}} + {{$t('trials:uploadDicomList:table:UploadedNumber')}}: {{lookText.Uploaded.length}} +
+
+
{{$t('trials:uploadDicomList:table:Failed')}}:
+
+
{{item}}
+
+
+
+
+
{{$t('trials:uploadDicomList:table:Existed')}}:
+
+
{{item}}
+
+
+
+
+
{{$t('trials:uploadDicomList:table:Uploaded')}}:
+
+
{{item}}
+
+
+