冲突解决
continuous-integration/drone/push Build is passing Details

wangxiaoshuang 2026-02-02 10:26:30 +08:00
parent 8a4b4fc9fb
commit 9b9c83797a
1 changed files with 5 additions and 5 deletions

View File

@ -253,7 +253,7 @@
<!-- 手册 -->
<span>{{ $t('trials:reading:button:handbooks') }}</span>
<span style="position: absolute;right: 20px;font-size: 20px;">
<svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
<svg-icon :icon-class="manualsDialog.isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
style="margin-right:10px;cursor: pointer;"
@click="manualsDialog.isFullscreen = !manualsDialog.isFullscreen" />
<svg-icon icon-class="close" style="cursor: pointer;" @click="manualsDialog.visible = false" />
@ -271,7 +271,7 @@
</div>
</template>
<script>
import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
import html2canvas from 'html2canvas'
import {
RenderingEngine,
@ -1113,7 +1113,7 @@ export default {
// const errorMsg = { message: 'annotation Not allowed to operate' }
// throw errorMsg
// }
this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
this.$emit('getMarkedFileIds', { type: "remove", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
} catch (err) {
cornerstoneTools.annotation.state.addAnnotation(annotation)
const renderingEngine = getRenderingEngine(renderingEngineId)
@ -1127,7 +1127,7 @@ export default {
})
}
} catch (e) {
cornerstoneTools.annotation.state.addAnnotation(annotation)
const renderingEngine = getRenderingEngine(renderingEngineId)
@ -1268,7 +1268,7 @@ export default {
// }
}
})
this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId})
this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
},
annotationSelectionChangeListener(e) {
console.log('selection')