diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue index 035917eb..60687d47 100644 --- a/src/views/trials/trials-panel/reading/ad-review/index.vue +++ b/src/views/trials/trials-panel/reading/ad-review/index.vue @@ -842,7 +842,7 @@ export default { var trialId = this.$route.query.trialId var file = await this.fileToBlob(param.file) const res = await this.OSSclient.put( - `/${trialId}/Read/${this.subjectId}/visit/${param.file.name}`, + `/${trialId}/Read/${this.subjectId}/${this.visitTaskId}/${param.file.name}`, file ) console.log(res) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue index bc35ff3a..e308b6e2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue @@ -721,7 +721,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue index 5d210dd4..de8c341e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue @@ -739,7 +739,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue index d79ac418..6bc066c0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue @@ -872,7 +872,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue index 9af16b9c..5b13de71 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue @@ -1073,7 +1073,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue index 2239ac5b..3fe2fb0f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue @@ -715,7 +715,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue index 5e0f34a5..622657b8 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue @@ -590,7 +590,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue index b4a509a2..765505d2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue @@ -452,7 +452,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue index 746692e6..e1ae2648 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue @@ -801,7 +801,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue index 0886f8ff..27f64a0f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue @@ -727,7 +727,7 @@ export default { file = this.convertBase64ToBlob(file) var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue index 767c26a8..8b606f6f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue @@ -483,7 +483,7 @@ export default { var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId var file = await this.fileToBlob(param.file) - const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file) + const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file) console.log(res) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) }) this.urls.push(this.$getObjectName(res.url)) diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue index 0d702d76..91bb40fb 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue @@ -120,7 +120,7 @@ name: "CustomizeReportPageUpload", var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId var file = await this.fileToBlob(param.file) - const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file) + const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file) console.log(res) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)}) this.urls.push(this.$getObjectName(res.url)) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index fff6af68..aa4af4ac 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -3206,7 +3206,7 @@ export default { const trialId = this.$route.query.trialId const taskInfo = JSON.parse(localStorage.getItem('taskInfo')) const subjectId = taskInfo.SubjectId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) 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 f030df7d..952b2a5c 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 @@ -1325,7 +1325,7 @@ export default { file = this.convertBase64ToBlob(file) const trialId = this.$route.query.trialId const subjectId = this.taskInfo.SubjectId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue index b3099029..8abf0462 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue @@ -1259,7 +1259,10 @@ export default { var index = fileName.lastIndexOf('.') var suffix = fileName.substring(index + 1, url.length) let file = await this.fileToBlob(param.file) - let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file) + // let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file) + const taskInfo = JSON.parse(localStorage.getItem('taskInfo')) + const subjectId = taskInfo.SubjectId + let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}`, file) this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}(${suffix})`, url: this.$getObjectName(res.url) }) this.urls.push(this.$getObjectName(res.url)) this.$emit("setFormItemData", { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question }) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue index 058ac16d..d6ab1ebf 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue @@ -991,7 +991,7 @@ export default { const trialId = this.$route.query.trialId const taskInfo = JSON.parse(localStorage.getItem('taskInfo')) const subjectId = taskInfo.SubjectId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue index 01d7e8c9..ec27ee00 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue @@ -561,7 +561,10 @@ export default { var index = fileName.lastIndexOf('.') var suffix = fileName.substring(index + 1, fileName.length) var file = await this.fileToBlob(param.file) - let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file) + // let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file) + const taskInfo = JSON.parse(localStorage.getItem('taskInfo')) + const subjectId = taskInfo.SubjectId + let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}`, file) this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}(${suffix})`, url: this.$getObjectName(res.url) }) this.urls.push(this.$getObjectName(res.url)) this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question }) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue index 5bc9b92c..00255b35 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue @@ -1428,7 +1428,7 @@ export default { file = this.convertBase64ToBlob(file) const trialId = this.$route.query.trialId const subjectId = this.taskInfo.SubjectId - const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file) + const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file) return { isSuccess: true, result: result } } catch (e) { console.log(e) diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue index 40f459fa..6b033d01 100644 --- a/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue +++ b/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue @@ -119,7 +119,7 @@ name: "UploadFile", var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId var file = await this.fileToBlob(param.file) - const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file) + const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file) console.log(res) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)}) this.urls.push(this.$getObjectName(res.url)) diff --git a/src/views/trials/trials-panel/reading/visit-review/components/CustomizeReportPageUpload.vue b/src/views/trials/trials-panel/reading/visit-review/components/CustomizeReportPageUpload.vue index 0d702d76..91bb40fb 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/CustomizeReportPageUpload.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/CustomizeReportPageUpload.vue @@ -120,7 +120,7 @@ name: "CustomizeReportPageUpload", var trialId = this.$route.query.trialId var subjectId = this.$route.query.trialId var file = await this.fileToBlob(param.file) - const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file) + const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file) console.log(res) this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)}) this.urls.push(this.$getObjectName(res.url))