diff --git a/src/api/load.js b/src/api/load.js index 3bc426ca..91981151 100644 --- a/src/api/load.js +++ b/src/api/load.js @@ -63,4 +63,12 @@ export function getIRReadingDownloadStudyInfo(data) { method: 'post', data }) +} +// 获取ir阅片和任务非dicom上传列表 +export function getIRUploadTaskNoneDicomStudyList(data) { + return request({ + url: '/DownloadAndUpload/getIRUploadTaskNoneDicomStudyList', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue index 58355b3a..c258168a 100644 --- a/src/components/uploadDicomAndNonedicom/index.vue +++ b/src/components/uploadDicomAndNonedicom/index.vue @@ -12,7 +12,11 @@ - + @@ -29,10 +33,20 @@ export default { type: Boolean, default: false, }, - visitId: { + SubjectId: { type: String, default: '', }, + SubjectCode: { + type: String, + default: '', + }, + Criterion: { + type: Object, + default: () => { + return {} + }, + }, }, data() { return { diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue index e69de29b..3bf44785 100644 --- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue @@ -0,0 +1,95 @@ + + + + {{ $t('upload:nonedicom:title') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/utils/stream.js b/src/utils/stream.js index de27a281..eef180e7 100644 --- a/src/utils/stream.js +++ b/src/utils/stream.js @@ -17,11 +17,7 @@ function zipFiles(zipName, files) { } else { let { name, url } = fileInfo.value; url = decodeUtf8(url); - return fetch(url, { - headers: { - 'Cross-Origin-Embedder-Policy': 'unsafe-none' - } - }).then(res => { + return fetch(url).then(res => { ctrl.enqueue({ name, stream: () => res.body @@ -46,11 +42,7 @@ async function updateFile(file, name) { store.dispatch('trials/setUnLock', true) const fileOutputStream = streamSaver.createWriteStream(name); file = decodeUtf8(file); - let res = await fetch(file, { - headers: { - 'Cross-Origin-Embedder-Policy': 'unsafe-none' - } - }); + let res = await fetch(file); res.body.pipeTo(fileOutputStream).then(() => { store.dispatch('trials/setUnLock', true) });