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/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)}}
-
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 }}
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() 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..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 @@ -527,7 +527,8 @@ export default { initAnnotations: [], activeCanvasWW: null, activeCanvasWC: null, - fusion: { visible: false } // 历史记录融合调窗 + fusion: { visible: false }, // 历史记录融合调窗 + screenshotWindow: null // initFirstAnnotation:false } }, @@ -621,8 +622,15 @@ 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() { + beforeDestroy() { cornerstoneTools.destroy() eventTarget.reset() cache.purgeCache() @@ -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) } } } 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) { diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue index db472eea..9713d05a 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue @@ -727,7 +727,7 @@ export default { methods: { handleConfirmModality() { this.form.ModalityList = Object.assign([], this.selectedList.map(v => 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; + } } 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 >
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/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 } 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 4e449d55..db39098c 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(', ') }}