Compare commits

..

No commits in common. "391e696d8a20170e6a482e7652cabebc2e96b303" and "3c0971e96198be31d94ba9e581651af9f9e06981" have entirely different histories.

2 changed files with 11 additions and 31 deletions

View File

@ -304,7 +304,7 @@ export default {
cornerstoneTools.addToolForElement(element, Note_RectangleRoiTool, { cornerstoneTools.addToolForElement(element, Note_RectangleRoiTool, {
configuration: { configuration: {
color: '#f00', color: '#f00',
lineWidth: 2, lineWidth: 0.5,
drawHandles: false, drawHandles: false,
fillColor: 'rgba(0, 0, 0, 1)', fillColor: 'rgba(0, 0, 0, 1)',
}, },

View File

@ -9,10 +9,10 @@
<div class="Anonymous" v-if="isAnonymous"> <div class="Anonymous" v-if="isAnonymous">
<div <div
:class="{ btn: true, activeBtn: activeTool === 'Note_RectangleRoi' && !isComparison, isNoted: isComparison }" :class="{ btn: true, activeBtn: activeTool === 'Note_RectangleRoi' && !isComparison, isNoted: isComparison }"
@click="setToolActive($event, 'Note_RectangleRoi', true)">{{ @click="setToolActive($event, 'Note_RectangleRoi')">{{
$t('DicomViewer:anonymous:Note_RectangleRoi') }}</div> $t('DicomViewer:anonymous:Note_RectangleRoi') }}</div>
<div :class="{ btn: true, activeBtn: activeTool === 'Eraser' && !isComparison, isNoted: isComparison }" <div :class="{ btn: true, activeBtn: activeTool === 'Eraser' && !isComparison, isNoted: isComparison }"
@click="setToolActive($event, 'Eraser', true)">{{ @click="setToolActive($event, 'Eraser')">{{
$t('DicomViewer:anonymous:Eraser') }} $t('DicomViewer:anonymous:Eraser') }}
</div> </div>
<div :class="{ btn: true, isNoted: isComparison }" @click="anonymousImage(false)">{{ <div :class="{ btn: true, isNoted: isComparison }" @click="anonymousImage(false)">{{
@ -299,8 +299,7 @@
v-if="type === 'Study' && modality && ['PT、CT', 'CT、PT', 'PET-CT'].includes(modality)"> v-if="type === 'Study' && modality && ['PT、CT', 'CT、PT', 'PET-CT'].includes(modality)">
<div class="sideTool-title">{{ $t('trials:tab:patientData') }}</div> <div class="sideTool-title">{{ $t('trials:tab:patientData') }}</div>
<div class="sideTool-wrapper"> <div class="sideTool-wrapper">
<el-form ref="patientForm" size="mini" :model="formData" :rules="rules" label-width="150" <el-form ref="patientForm" size="mini" :model="formData" :rules="rules" label-width="150" v-loading="formLoading">
v-loading="formLoading">
<!-- 性别 --> <!-- 性别 -->
<el-form-item :label="$t('trials:ptData:label:patientSex')" prop="PatientSex"> <el-form-item :label="$t('trials:ptData:label:patientSex')" prop="PatientSex">
<el-select v-model="formData.PatientSex" :placeholder="$t('common:ruleMessage:select')" <el-select v-model="formData.PatientSex" :placeholder="$t('common:ruleMessage:select')"
@ -642,7 +641,7 @@ export default {
}) })
}) })
let res = await this.studyMaskImage(data) let res = await this.studyMaskImage(data)
if (!res || res.length <= 0) return false if (!res) return false
this.$emit("update:loading", true) this.$emit("update:loading", true)
if (!isAll) { if (!isAll) {
let strs = image.imageId.split("?") let strs = image.imageId.split("?")
@ -840,25 +839,8 @@ export default {
} }
}) })
}, },
setToolActive(e, toolName, isNotSetClassName = false) { setToolActive(e, toolName) {
const elements = document.querySelectorAll('.dicom-item') const elements = document.querySelectorAll('.dicom-item')
if (isNotSetClassName) {
const scope = this
if (scope.activeTool) {
Array.from(elements).forEach((element, index) => {
if (element.style.display !== 'none') {
scope.$refs[`dicomCanvas${index}`].setToolPassive(scope.activeTool)
}
})
}
if (scope.activeTool === toolName) return scope.activeTool = null
scope.activeTool = toolName
return Array.from(elements).forEach((element, index) => {
if (element.style.display !== 'none') {
scope.$refs[`dicomCanvas${index}`].setToolActive(toolName)
}
})
}
if (e.currentTarget.classList.contains('activeTool')) { if (e.currentTarget.classList.contains('activeTool')) {
e.currentTarget.classList.remove('activeTool') e.currentTarget.classList.remove('activeTool')
const scope = this const scope = this
@ -1179,7 +1161,6 @@ export default {
cursor: pointer; cursor: pointer;
padding: 5px 10px; padding: 5px 10px;
border: 1px solid rgba(255, 255, 255, .7); border: 1px solid rgba(255, 255, 255, .7);
color: #000;
&:hover { &:hover {
background-color: rgba(255, 255, 255, .5); background-color: rgba(255, 255, 255, .5);
@ -1187,8 +1168,7 @@ export default {
} }
.activeBtn { .activeBtn {
background-color: #16477b90; background-color: rgba(255, 255, 255, .5);
color: #fff;
} }
.isNoted { .isNoted {