From 88cc255c56ebd1056804ff9e315d565746c55119 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 09:30:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/study/index.vue | 2 +- src/views/trials/trials-panel/visit/crc-upload/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue index a87226fd..387c91f5 100644 --- a/src/views/trials/trials-panel/study/index.vue +++ b/src/views/trials/trials-panel/study/index.vue @@ -113,7 +113,7 @@
{{ scope.row.Modalities }}({{ scope.row.Count }}),
N/A,
-
{{ getBodyPart(scope.row.Bodypart) }},
+
{{ scope.row.Bodypart }},
N/A,
{{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
N/A
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue index 126463df..e6f179fa 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/index.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue @@ -237,7 +237,7 @@ {{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}
- {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(','):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }} + {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(', '):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }} From fd5cce0ed93b61366b4bfe3307ee656527375431 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 09:41:42 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 5 +++-- src/views/trials/trials-layout/components/trialsNavbar.vue | 5 +++-- .../setting/trial-config/components/processConfig.vue | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 9ce11fc3..d8a1ad17 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -23,8 +23,9 @@
- {{ name }} - ({{ userTypeShortName }}) + {{ `${name} (${userTypeShortName})` }} + diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index f91dc235..f0654cac 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -40,8 +40,9 @@ - {{ userName }} - ({{ userTypeShortName }}) + {{ `${name} (${userTypeShortName})` }} + {{ $t('trials:trials-myinfo:title:accountInfo') }} diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue index 34b98fff..270116a3 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue @@ -661,7 +661,7 @@ show-overflow-tooltip > From db7498938f8bb5cda93420be3266241d59602623 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 10:24:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enrolled-reviewers/list/index.vue | 10 +++++----- .../trial-config/components/logicalConfig.vue | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue index 59cb32cb..e097df4a 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue @@ -81,13 +81,13 @@ @change="(v) => {return isEnableChange(scope.row, v)}" :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])" /> - {{$fd('IsEnable', scope.row.IsEnable)}} + {{$fd('IsEnable', scope.row.IsEnable)}}
v.value)) - this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|') + this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ') this.modalityListVisible = false }, handleSelectionChange(val) { @@ -781,7 +781,7 @@ export default { var bodyPartTypes = this.form.BodyPartTypeList.map(i => { return this.$fd('Bodypart', i) }) - this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|') + this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ') this.bodyPartListVisible = false }, // 配置信息保存 @@ -791,7 +791,7 @@ export default { this.loading = true // 保存配置信息 var params = Object.assign({}, this.form) - params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|') + params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ') configTrialBasicInfo(params).then(res => { this.loading = false if (res.IsSuccess) { @@ -842,7 +842,7 @@ export default { this.btnLoading = true // 保存配置信息 var params = Object.assign({}, this.form) - params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|') + params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ') configTrialBasicInfo(params).then(res => { this.btnLoading = false if (res.IsSuccess) { @@ -865,7 +865,7 @@ export default { signConfirm(signInfo) { this.loading = true var obj = Object.assign({}, this.form) - obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|') + obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ') const params = { data: obj, signInfo: signInfo @@ -978,12 +978,12 @@ export default { this.form[k] = res[k] } } - this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|') - this.form.BodyPartTypeList = this.form.BodyPartTypes.split('|') + this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ') + this.form.BodyPartTypeList = this.form.BodyPartTypes.split(' | ') var bodyPartTypes = this.form.BodyPartTypeList.map(i => { return this.$fd('Bodypart', i) }) - this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|') + this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ') // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ') this.initialForm = { ...this.form } this.loading = false @@ -1104,5 +1104,8 @@ export default { .fontColor{ color: red; } + ::v-deep .el-table__header-wrapper .el-checkbox { + display: none !important; + } } From 0e5d1fb71872e789b773f4f28f133b7959033439 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 10:53:10 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=97=85=E7=81=B6=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=90=8C=E6=97=B6=E5=8F=AA=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Fusion/HistoryScreenshot.vue | 5 +++++ .../reading/dicoms/components/Fusion/PetCt.vue | 15 ++++++++++++++- .../dicoms/components/Fusion/Questions.vue | 3 +-- .../components/Fusion/TableQuestionItem.vue | 3 +-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue index d32363ee..c1ea5f88 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue @@ -151,6 +151,11 @@ export default { }) }) }, + receiveMsg(event) { + if (event.data.type === 'setReadingState' || event.data.type === 'closeHistoryScreenshot') { + window.close() + } + }, toRight() { if (this.translateX < this.pageSize * this.itemWidth) { this.translateX = 0 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 eda2ef90..9fc36654 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 @@ -527,7 +527,8 @@ export default { initAnnotations: [], activeCanvasWW: null, activeCanvasWC: null, - fusion: { visible: false } // 历史记录融合调窗 + fusion: { visible: false }, // 历史记录融合调窗 + screenshotWindow: null // initFirstAnnotation:false } }, @@ -621,6 +622,13 @@ export default { loading.close() callback(pictureBaseStr) }) + FusionEvent.$on('viewHistoryScreenshot', (path) => { + if (this.screenshotWindow) { + this.screenshotWindow.close() + } + const routeData = this.$router.resolve({ path }) + this.screenshotWindow = window.open(routeData.href, '_blank') + }) }, destroyed() { cornerstoneTools.destroy() @@ -2127,11 +2135,16 @@ export default { } else if (event.data.type === 'readingPageStateUpdate') { this.readingTaskState = event.data.data.readingTaskState if (this.readingTaskState === 2) { + FusionEvent.$emit('closeHistoryScreenshot') + if (this.screenshotWindow) { + this.screenshotWindow.close() + } window.close() } } else if (event.data.type === 'setReadingState') { this.readingTaskState = event.data.data.readingTaskState if (this.readingTaskState === 2) { + FusionEvent.$emit('closeHistoryScreenshot') window.close() } } 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 fd991db0..a1d38c19 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 @@ -417,8 +417,7 @@ export default { var token = getToken() var subjectCode = this.$route.query.subjectCode var path = `/historyScreenshot?&subjectCode=${subjectCode}&visitTaskId=${this.visitTaskId}&questionType=${question.QuestionType}&TokenKey=${token}` - const routeData = this.$router.resolve({ path }) - window.open(routeData.href, '_blank') + FusionEvent.$emit('viewHistoryScreenshot', path) }, setMeasuredData(measurement) { if (measurement.data.isHandleOutsideImage) { 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 cf5a5eef..2a42a448 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 @@ -1022,8 +1022,7 @@ export default { var token = getToken() var subjectCode = this.$route.query.subjectCode var path = `/historyScreenshot?rowId=${rowId}&subjectCode=${subjectCode}&lesionName=${this.lesionName}&TokenKey=${token}` - const routeData = this.$router.resolve({ path }) - window.open(routeData.href, '_blank') + FusionEvent.$emit('viewHistoryScreenshot', path) } } } From 7e1165888b179aa52ac22c747656c73a5a622a60 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 11:19:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AE=8C=E5=A4=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subject/reading-period/index.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue index 7e6e774e..32d7981a 100644 --- a/src/views/trials/trials-panel/subject/reading-period/index.vue +++ b/src/views/trials/trials-panel/subject/reading-period/index.vue @@ -54,6 +54,17 @@ clearable /> + + + + + + {{ $t('common:button:search') }} @@ -173,7 +184,10 @@
-
+
+ + + {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
@@ -355,6 +369,7 @@ const searchDataDefault = () => { ModuleType: null, ReadingStatus: null, Name: '', + CompleteClinicalData: '', PageIndex: 1, PageSize: 20 } From 07a32b9b2aa1c6ea42187cf5ea503c945b99c088 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 11:39:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue | 2 +- .../trials-panel/reading/dicoms/components/Fusion/Viewport.vue | 3 --- 2 files changed, 1 insertion(+), 4 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 9fc36654..64b09e8d 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 @@ -630,7 +630,7 @@ export default { this.screenshotWindow = window.open(routeData.href, '_blank') }) }, - destroyed() { + beforeDestroy() { cornerstoneTools.destroy() eventTarget.reset() cache.purgeCache() diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue index 29bbade4..849757b8 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue @@ -225,9 +225,6 @@ export default { this.rotateBarMousemove(e) } }) - }, - destroyed() { - }, methods: { handleVolumeNewImage(e) { From 0de0e887b43fd2585af57abcc038ab109d981440 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 13:15:13 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms/components/DicomViewer.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 5f18ffed..6a2a2060 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -1878,7 +1878,8 @@ export default { var oA = document.createElement('a') var subjectCode = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].subjectCode var taskBlindName = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack.taskBlindName - oA.download = `${subjectCode}_${taskBlindName}`// 设置下载的文件名，默认是'下载' + var timestamp = Date.now() + oA.download = `${subjectCode}_${taskBlindName}_${timestamp}`// 设置下载的文件名，默认是'下载' oA.href = oImg document.body.appendChild(oA) oA.click() From 1a9f6c37b863de693d9a5ef3a13a21614ad781b7 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 28 Mar 2024 13:26:36 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=A7=86=E8=A7=92?= =?UTF-8?q?=E4=BF=A1=E6=81=AFslice=20Location=E6=B7=BB=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms/components/DicomCanvas.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 8ce2f9b6..1ad5f6ee 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -99,8 +99,8 @@
-
Location: {{ Number(dicomInfo.location).toFixed(digitPlaces) }}
-
Slice Thickness: {{ dicomInfo.thick }}mm
+
Location: {{ `${Number(dicomInfo.location).toFixed(digitPlaces)} mm` }}
+
Slice Thickness: {{ `${dicomInfo.thick} mm` }}
WW/WL: {{ dicomInfo.wwwc }}