diff --git a/src/views/research/login.vue b/src/views/research/login.vue index 8009844c..9981902b 100644 --- a/src/views/research/login.vue +++ b/src/views/research/login.vue @@ -42,8 +42,8 @@ {{ $t('trials:researchForm:button:updateQsForm') }} - - + + {{ $t('trials:researchForm:button:cancelUpdateQsForm') }} @@ -214,7 +214,11 @@ export default { let { email, oldEMail, trialSiteId } = this.$route.query if (trialSiteId) this.form.TrialSiteId = trialSiteId if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail - if (email) this.form.EmailOrPhone = email + if (email && email !== 'null') { + this.form.EmailOrPhone = email + } else { + this.form.EmailOrPhone = oldEMail + } } }, methods: { diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js index b92ed1c8..9dd68cc1 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js @@ -313,6 +313,15 @@ const config = { 'isDisabled': false, 'disabledReason': '' }, + { + 'name': '长短径测量工具', + 'icon': 'bidirection', + 'toolName': 'Bidirectional', + 'props': ['length', 'width'], + 'i18nKey': 'trials:reading:button:bidirectional', + 'isDisabled': false, + 'disabledReason': '' + }, { 'name': '矩形工具', 'icon': 'rectangle', @@ -322,15 +331,6 @@ const config = { 'isDisabled': false, 'disabledReason': '' }, - { - 'name': '箭头工具', - 'icon': 'arrow', - 'toolName': 'ArrowAnnotate', - 'props': [], - 'i18nKey': 'trials:reading:button:arrowAnnotate', - 'isDisabled': false, - 'disabledReason': '' - }, { 'name': '圆形工具', 'icon': 'oval', @@ -349,6 +349,15 @@ const config = { 'isDisabled': false, 'disabledReason': '' }, + { + 'name': '自由曲线', + 'icon': 'polygon', + 'toolName': 'PlanarFreehandROI', + 'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'], + 'i18nKey': 'trials:reading:button:planarFreehandROI', + 'isDisabled': false, + 'disabledReason': '' + }, { 'name': '角度工具', 'icon': 'angle', @@ -359,11 +368,11 @@ const config = { 'disabledReason': '' }, { - 'name': '自由曲线', - 'icon': 'polygon', - 'toolName': 'PlanarFreehandROI', - 'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'], - 'i18nKey': 'trials:reading:button:planarFreehandROI', + 'name': '箭头工具', + 'icon': 'arrow', + 'toolName': 'ArrowAnnotate', + 'props': [], + 'i18nKey': 'trials:reading:button:arrowAnnotate', 'isDisabled': false, 'disabledReason': '' }, diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue index a874ede7..1ddbf378 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue @@ -308,7 +308,8 @@ const { LengthTool, EllipticalROITool, CircleROITool, - AngleTool + AngleTool, + BidirectionalTool, // cursors } = cornerstoneTools const { MouseBindings, Events: toolsEvents } = csToolsEnums @@ -607,7 +608,7 @@ export default { cornerstoneTools.addTool(EraserTool) cornerstoneTools.addTool(LengthTool) cornerstoneTools.addTool(LengthscaleTool) - + cornerstoneTools.addTool(BidirectionalTool) viewportIds.forEach((viewportId, i) => { const toolGroupId = `canvas-${i}` const toolGroup = ToolGroupManager.createToolGroup(toolGroupId) @@ -635,6 +636,10 @@ export default { cachedStats: false, getTextLines: this.getRectangleROIToolTextLines }) + toolGroup.addTool(BidirectionalTool.toolName, { + // cachedStats: true + getTextLines: this.getBidirectionalToolTextLines + }) toolGroup.addTool(EllipticalROITool.toolName, { cachedStats: false, getTextLines: this.getEllipticalROIToolTextLines @@ -684,6 +689,7 @@ export default { toolGroup.setToolPassive(SplineROITool.toolName) toolGroup.setToolPassive(LengthTool.toolName) toolGroup.setToolPassive(LengthscaleTool.toolName) + toolGroup.setToolPassive(BidirectionalTool.toolName) } else { toolGroup.setToolEnabled(ArrowAnnotateTool.toolName) toolGroup.setToolEnabled(RectangleROITool.toolName) @@ -694,6 +700,7 @@ export default { toolGroup.setToolEnabled(SplineROITool.toolName) toolGroup.setToolEnabled(LengthTool.toolName) toolGroup.setToolEnabled(LengthscaleTool.toolName) + toolGroup.setToolEnabled(BidirectionalTool.toolName) } toolGroup.setToolPassive(EraserTool.toolName) }) @@ -1430,6 +1437,38 @@ export default { } return textLines }, + // 长短径工具注释 + getBidirectionalToolTextLines(data, targetId) { + const { cachedStats, label } = data + const { length, width, unit } = cachedStats[targetId] + let ps = null + const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1] + const i = this.psArr.findIndex(i => i.Path === path) + if (i > -1 && this.psArr[i].PS) { + ps = parseFloat(this.psArr[i].PS).toFixed(3) + } + const textLines = [] + if (label) { + textLines.push(data.status ? `${label}(${data.status})` : label) + } + if (length === undefined) { + return textLines + } + if (ps) { + textLines.push( + `L: ${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`, + `S: ${this.reRound(csUtils.roundNumber(width * ps), this.digitPlaces)} mm` + ) + } else { + textLines.push( + `L: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit || unit}`, + `S: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}` + ) + } + + + return textLines + }, // 直线工具注释 getLengthToolTextLines(data, targetId) { const cachedVolumeStats = data.cachedStats[targetId] diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue index 1616a5d4..0ee5ef3e 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue @@ -20,7 +20,7 @@ study.StudyName }}
- {{ study.BodyPart }} + {{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }} {{ study.Modality }}
@@ -74,18 +74,40 @@ export default { activeFileIndex: -1, taskInfo: null, studyList: [], - pdf + pdf, + BodyPart: {} } }, - mounted() { + async mounted() { this.taskInfo = JSON.parse(localStorage.getItem('taskInfo')) this.studyList = this.visitTaskInfo.StudyList if (this.studyList.length === 0) return this.$nextTick(() => { this.activeStudy(this.studyList[0].Id) }) + this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId) }, methods: { + getBodyPart(bodyPart, other) { + if (!bodyPart && !other) return '' + var separator = ',' + if (bodyPart.indexOf('|') > -1) { + separator = '|' + } else if (bodyPart.indexOf(',') > -1) { + separator = ',' + } else if (bodyPart.indexOf('，') > -1) { + separator = '，' + } + var arr = bodyPart.split(separator) + var newArr = arr.map((i) => { + return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name') + }) + if (other) { + newArr.push(other) + } + newArr = newArr.filter(Boolean) + return newArr.join(' | ') + }, // 设置初始化激活文件 setInitActiveFile() { if (this.studyList.length === 0) return diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue index 6a3fa3f0..6c37f5b1 100644 --- a/src/views/trials/trials-panel/site/index.vue +++ b/src/views/trials/trials-panel/site/index.vue @@ -193,7 +193,7 @@ {{ $t('common:button:confirm') }} - + {{ $t('common:button:cancel') }} diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue index 65d26fad..da4ca5bd 100644 --- a/src/views/trials/trials-panel/study/index.vue +++ b/src/views/trials/trials-panel/study/index.vue @@ -5,18 +5,9 @@ - - + + @@ -25,19 +16,9 @@ - - + + {{ item.VisitName }} @@ -45,12 +26,7 @@ - + @@ -60,11 +36,7 @@ {{ $t("common:button:search") }} - + {{ $t("common:button:reset") }} @@ -73,42 +45,22 @@ - + - - - + + + - + - + @@ -327,30 +237,17 @@
- 复制链接及提取码 + 复制链接及提取码
- -
- + +
+
@@ -411,16 +308,36 @@ export default { trialId: this.$route.query.trialId, tokenKey: getToken(), openWindow: null, - bp: [], + BodyPart: {} }; }, async mounted() { - this.bp = await this.$getBodyPart(this.$route.query.trialId); + this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId) this.getSite(); this.getVisitPlanOptions(); this.getList(); }, methods: { + getBodyPart(bodyPart, other) { + if (!bodyPart && !other) return '' + var separator = ',' + if (bodyPart.indexOf('|') > -1) { + separator = '|' + } else if (bodyPart.indexOf(',') > -1) { + separator = ',' + } else if (bodyPart.indexOf('，') > -1) { + separator = '，' + } + var arr = bodyPart.split(separator) + var newArr = arr.map((i) => { + return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name') + }) + if (other) { + newArr.push(other) + } + newArr = newArr.filter(Boolean) + return newArr.join(' | ') + }, // 获取检查列表数据 getList() { this.loading = true; @@ -550,28 +467,28 @@ export default { this.loading = false; }); }, - getBodyPart(bodyPart) { - if (!bodyPart) return ""; - var separator = ","; - if (bodyPart.indexOf("|") > -1) { - separator = "|"; - } else if (bodyPart.indexOf(",") > -1) { - separator = ","; - } else if (bodyPart.indexOf("，") > -1) { - separator = "，"; - } - var arr = bodyPart.split(separator); - var newArr = arr.map((i) => { - return this.$fd( - "Bodypart", - i.trim(), - "Code", - { Bodypart: this.bp }, - "Name" - ); - }); - return newArr.join(" | "); - }, + // getBodyPart(bodyPart) { + // if (!bodyPart) return ""; + // var separator = ","; + // if (bodyPart.indexOf("|") > -1) { + // separator = "|"; + // } else if (bodyPart.indexOf(",") > -1) { + // separator = ","; + // } else if (bodyPart.indexOf("，") > -1) { + // separator = "，"; + // } + // var arr = bodyPart.split(separator); + // var newArr = arr.map((i) => { + // return this.$fd( + // "Bodypart", + // i.trim(), + // "Code", + // { Bodypart: this.bp }, + // "Name" + // ); + // }); + // return newArr.join(" | "); + // }, // 复制 copyCode() { this.$copyText(`链接: ${this.shareLink} 提取码: ${this.extractionCode}`) diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue index 957ab68f..5ec8e551 100644 --- a/src/views/trials/trials-panel/subject/subject-list/index.vue +++ b/src/views/trials/trials-panel/subject/subject-list/index.vue @@ -141,7 +141,7 @@ :title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" /> + circle :title="$t('trials:subject:title:chart')" @click="handleopenSubjectChart(scope.row)" /> 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 b6a2d28f..bab309bb 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 @@ -423,7 +423,7 @@ + :title="$t('trials:uploadDicoms:title:previewLocalImage')" append-to-body>