diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js index 1d99fb1d..cebb8312 100644 --- a/src/api/trials/reading.js +++ b/src/api/trials/reading.js @@ -436,9 +436,9 @@ export function addSubjectCancelDoctorNote(params) { }) } -export function getSubjectCancelDoctorHistoryList(SubjectId) { +export function getSubjectCancelDoctorHistoryList(SubjectId, TrialReadingCriterionId) { return request({ - url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}`, + url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}&&TrialReadingCriterionId=${TrialReadingCriterionId}`, method: 'get' }) } diff --git a/src/components/uploadImage/index.vue b/src/components/uploadImage/index.vue index c1901df3..05e1a81e 100644 --- a/src/components/uploadImage/index.vue +++ b/src/components/uploadImage/index.vue @@ -5,6 +5,7 @@ :close-on-click-modal="false" custom-class="upload-dialog" :before-close="beforeClose" + class="uploadImage" > {{ title }} {{ @@ -263,4 +264,7 @@ export default { padding-top: 15px; } } +.uploadImage { + background-color: #fff; +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index b2eae15e..70230303 100644 --- a/src/main.js +++ b/src/main.js @@ -232,7 +232,6 @@ async function VueInit() { try { let data = arr || d; type = type || 'value'; - console.log(data,type,key,code) // code === 'YesOrNo' ? console.log(d) : '' return data[code].find(i => { return i[type] === v diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index d17e693e..c891d2aa 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -2,56 +2,50 @@ - - + + - + - + - - A - + A - - A - - - A - + A + A - - - A - - - B - + + A + B - - - - A - - - A - + + A + A - - - A - - - A - + + A + A @@ -60,31 +54,45 @@ - - + + - + - - + - + {{ item.label }} {{ item.ww }}/{{ item.wc }} - + {{ item.label }} @@ -94,9 +102,13 @@ > W/L {{ $t('trials:reading:title:preset') }} --> - {{ ` ${$t('trials:reading:title:preset') }` }} + {{ ` ${$t("trials:reading:title:preset")}` }} - @@ -117,71 +129,103 @@ 区域调窗 --> - + - - - - + + - + - {{ $t('trials:reading:button:zoom') }} + {{ $t("trials:reading:button:zoom") }} - + - {{ $t('trials:reading:button:move') }} + {{ $t("trials:reading:button:move") }} - - + + - + - {{ $t('trials:reading:button:rotate') }} + + {{ $t("trials:reading:button:rotate") + }} + - - - {{ rotate.label }} + + + {{ rotate.label }} @@ -189,31 +233,59 @@ - + - + - {{ fitType===1?$t('trials:reading:button:fitWindow'):$t('trials:reading:button:fitImage') }} + + {{ + fitType === 1 + ? $t("trials:reading:button:fitWindow") + : $t("trials:reading:button:fitImage") + }} + - + - {{ $t('trials:reading:button:imageIndexSync') }} + + {{ $t("trials:reading:button:imageIndexSync") }} + - + - + - {{ $t('trials:reading:button:screenShot') }} + {{ $t("trials:reading:button:screenShot") }} - + - {{ tool.text }} - {{ tool.disabledReason }} + {{ tool.text }} + {{ tool.disabledReason }} {{ tool.text }} - @@ -280,37 +350,65 @@ {{ tool.text }} --> - - + + - {{ $t('trials:dicom-show:Eraser') }} + {{ $t("trials:dicom-show:Eraser") }} - + - + - - + + @@ -318,22 +416,41 @@ - + - + - - + + - {{ $t('trials:dicom-show:default') }} + {{ $t("trials:dicom-show:default") }} 5 10 15 @@ -343,48 +460,104 @@ - + - + - {{ $t('trials:reading:button:reset') }} + {{ $t("trials:reading:button:reset") }} + + + + + + + + {{ $t("trials:reading:button:upload") }} + + + + + + + + {{ $t("trials:reading:button:download") }} - - - {{$t('trials:reading:button:handbooks')}} + + + {{ $t("trials:reading:button:handbooks") }} - {{ $t('trials:reading:button:clinicalData') }} + {{ $t("trials:reading:button:clinicalData") }} - {{$t('trials:reading:button:customCfg')}} - - + {{ + $t("trials:reading:button:customCfg") + }} - - + @@ -406,7 +579,6 @@ :isReadingShowSubjectInfo="isReadingShowSubjectInfo" ref="measurementList" /> - @@ -431,7 +603,11 @@ > - + @@ -440,55 +616,75 @@ - - {{$t('trials:reading:button:handbooks')}} - - - + {{ $t("trials:reading:button:handbooks") }} + + + - + - - - + + + +