From a7a8f25ca0bb8a12acdc03c32193908986ffed2b Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 17 Jan 2024 14:12:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=8F=8A=E4=BF=9D=E5=AD=98=E7=97=85=E7=81=B6=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=A0=87=E8=AE=B0=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 2 +- .../dicoms/components/Fusion/PetCt.vue | 3 +- .../components/Fusion/TableQuestionItem.vue | 2 +- .../components/IRecist/QuestionForm.vue | 2 +- .../dicoms/components/Lugano/QuestionForm.vue | 30 ++++++++++--------- .../dicoms/components/PCWG/QuestionForm.vue | 2 +- .../dicoms/components/Recist/QuestionForm.vue | 2 +- .../components/RecistBM/QuestionForm.vue | 2 +- .../reading/oncology-review/index.vue | 3 +- 9 files changed, 26 insertions(+), 22 deletions(-) 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 @@ -
- Image -
+ :label="$t('trials:lugano:button:suvscreenshot')" + > +
+ Image +
+
{ 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 }) From 6352a6652e9cfefde477b08701c2bd0c7e627404 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 17 Jan 2024 14:24:35 +0800 Subject: [PATCH 2/5] 1 --- .eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index f8cee48b..3ff12bc3 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/* From d769e4ddd937d9e724fbff59a4f0db0068978551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= Date: Wed, 17 Jan 2024 15:01:20 +0800 Subject: [PATCH 3/5] 1 --- .../trial-summary/upload-monitor/index.vue | 29 +++++++++- .../components/uploadDicomFiles2.vue | 54 ++++++++++--------- 2 files changed, 56 insertions(+), 27 deletions(-) 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}}
+
+
无
+
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index f1b4e363..1ce19358 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -136,6 +136,7 @@
- {{$t('trials:uploadDicomList:table:Existed')}} -
- {{item}} -
-
- 无 -
- {{$t('trials:uploadDicomList:table:Uploaded')}} -
- {{item}} -
-
- 无 -
-
- {{$t('trials:uploadDicomList:table:Failed')}} -
- {{item}} -
-
- 无 +
+ {{$t('trials:uploadDicomList:table:Existed')}} +
+ {{item}} +
+
+ 无 +
+ {{$t('trials:uploadDicomList:table:Uploaded')}} +
+ {{item}} +
+
+ 无 +
+
+ {{$t('trials:uploadDicomList:table:Failed')}} +
+ {{item}} +
+
+ 无 +
{{ scope.row.uploadState.record.Existed.length }}/{{ scope.row.uploadState.record.Uploaded.length }}/{{ scope.row.uploadState.record.Failed.length }}
@@ -307,10 +310,11 @@ @@ -960,7 +964,7 @@ export default { this.uploadQueues = this.uploadQueues.filter(v => { return !!v.uploadState.record.Failed.length }) - console.log(this.uploadQueues) + this.$refs.pathClear.value = '' this.btnLoading = false }).catch(_ => { this.btnLoading = false }) }, @@ -1046,9 +1050,9 @@ export default { }, 5000) scope.myInterval.push(t) let Record = { + Failed: [], Existed: [], Uploaded: [], - Failed: [], FileCount: 0 } let params = { From b5aac33e0b73b73867d1001b2a8cdda1d263547f Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 17 Jan 2024 16:01:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=80=BC=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E8=A1=A5=E5=85=85=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 2 +- .../reading/dicoms/components/DicomViewer.vue | 12 ++- .../dicoms/components/Lugano/QuestionForm.vue | 83 +++++++++++++------ 3 files changed, 68 insertions(+), 29 deletions(-) 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/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/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue index df0f19e8..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,33 +177,60 @@ {{ val }} - - - - - -
- Image +
+ + + + + + {{ $t('trials:lugano:button:suvscreenshot') }} + + Image + + + +
+ +
{ From 06b5110fbc6326a6ca285d23a9d3d8ad4115d3d3 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 17 Jan 2024 16:09:13 +0800 Subject: [PATCH 5/5] 1 --- .eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index f8cee48b..3ff12bc3 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/*