diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue index 4a0c4b64..5ff10701 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue @@ -867,7 +867,7 @@ export default { if (lesionType === 1 && lesionState === 0) { if (lymphNodes === 1) { // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具 - if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) { + if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记 this.$confirm(this.$t('trials:reading:warnning:msg21'), { type: 'warning', @@ -879,7 +879,8 @@ export default { } } else { // 非淋巴结非靶病灶 直径测量工具或箭头工具 - if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) { + console.log(measureData, 'measureData') + if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记! this.$confirm(this.$t('trials:reading:warnning:msg22'), { type: 'warning', @@ -1026,7 +1027,7 @@ export default { if (lesionType === 1 && lesionState === 0) { if (lymphNodes === 1) { // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具 - if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) { + if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记! this.$confirm(this.$t('trials:reading:warnning:msg31'), { type: 'warning', @@ -1038,7 +1039,7 @@ export default { } } else { // 非淋巴结非靶病灶 直径测量工具、箭头工具 - if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) { + if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记! this.$confirm(this.$t('trials:reading:warnning:msg32'), { type: 'warning', @@ -1055,7 +1056,7 @@ export default { if (lesionType === 1 && lesionState === 1) { if (lymphNodes === 1) { // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具 - if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) { + if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记!` this.$confirm(this.$t('trials:reading:warnning:msg33'), { type: 'warning', @@ -1067,7 +1068,7 @@ export default { } } else { // 非淋巴结非靶病灶 直径测量工具、箭头工具 - if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) { + if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) { // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记! this.$confirm(this.$t('trials:reading:warnning:msg34'), { type: 'warning', @@ -1722,6 +1723,7 @@ export default { obj => !obj.RowId ) if (typeof obj === 'object') { + console.log(111) if (this.activeName) { const tableId = this.activeName.split('_')[0] const rowIndex = this.activeName.split('_')[1] @@ -1741,16 +1743,23 @@ export default { return { isCanActiveTool: false, reason: msg } } } else { + console.log(222) if (this.activeName) { + console.log(3333) return this.checkToolCanActive(toolName) } else { - if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) { + console.log(444, this.isBaseLineTask, toolName) + if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) { + console.log(555) return { isCanActiveTool: true, reason: '' } - } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) { + } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) { + console.log(666) return { isCanActiveTool: true, reason: '' } } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') { + console.log(777) return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') } } else { + console.log(888) return { isCanActiveTool: false, reason: '' } } } @@ -1769,10 +1778,10 @@ export default { } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') { // '非淋巴结靶病灶需使用直径测量工具' return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') } - } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleROI') { + } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') { // '淋巴结非靶病灶需使用长短径测量工具或矩形工具' return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') } - } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleROI') { + } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi') { // '非淋巴结非靶病灶需使用直径测量工具或矩形工具' return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') } } else if (toolName === 'ArrowAnnotate') { @@ -1787,10 +1796,10 @@ export default { } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') { // 非淋巴结靶病灶需使用直径测量工具或箭头工具 return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') } - } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') { + } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') { // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具 return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') } - } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') { + } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') { // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具 return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') } } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {