diff --git a/src/utils/oss.js b/src/utils/oss.js
index 723d155e..ed0037f2 100644
--- a/src/utils/oss.js
+++ b/src/utils/oss.js
@@ -59,7 +59,7 @@ async function ossGenerateSTS() {
let params = Object.assign({path: objectName}, fileInfo)
addOrUpdateFileUploadRecord(params)
} else if (trialId) {
- let params = { trialId }
+ let params = { trialId, path: objectName }
addOrUpdateFileUploadRecord(params)
}
resolve({
@@ -111,7 +111,7 @@ async function ossGenerateSTS() {
let params = Object.assign({path: data.path}, fileInfo)
addOrUpdateFileUploadRecord(params)
} else if (trialId) {
- let params = { trialId }
+ let params = { trialId, path: data.path }
addOrUpdateFileUploadRecord(params)
}
@@ -238,7 +238,7 @@ function uploadAWS(aws, data, progress, fileInfo) {
let params = Object.assign({path: decodeUtf8(curPath)}, fileInfo)
addOrUpdateFileUploadRecord(params)
} else if (trialId) {
- let params = { trialId }
+ let params = { trialId, path: decodeUtf8(curPath) }
addOrUpdateFileUploadRecord(params)
}
resolve({
diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue b/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
index e4ffbf13..6730bbca 100644
--- a/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
+++ b/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
@@ -99,11 +99,11 @@
-
+
-
+
-
+
{{ $fd('YesOrNo', scope.row.IsNeedSync) }}
@@ -113,10 +113,10 @@
-
-
-
-
+
+
+
+
{{ $fd('YesOrNo', scope.row.IsSync) }}
@@ -126,7 +126,7 @@
-
+
@@ -244,7 +244,9 @@ export default {
props: {
rowInfo: {
type: Object,
- required: true,
+ default() {
+ return {}
+ }
},
dataFileType: {
type: Number,
@@ -298,9 +300,12 @@ export default {
try {
this.loading = true
this.searchData.TrialId = this.$route.query.trialId
- this.searchData.SubjectCode = this.rowInfo.SubjectCode
- this.searchData.VisitName = this.rowInfo.VisitName
- this.searchData.StudyCode = this.rowInfo.StudyCode
+ if (Object.keys(this.rowInfo).length !== 0) {
+ this.searchData.SubjectCode = this.rowInfo.SubjectCode
+ this.searchData.VisitName = this.rowInfo.VisitName
+ this.searchData.StudyCode = this.rowInfo.StudyCode
+ }
+
this.searchData.DataFileType = this.dataFileType
let res = await getFileUploadRecordList(this.searchData)
this.loading = false
diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
index 42ca8335..0b914077 100644
--- a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
+++ b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
@@ -180,12 +180,6 @@ const searchDataDefault = () => {
}
export default {
components: { BaseContainer, Pagination, FileList, TaskList },
- props: {
- dataFileType: {
- type: Number,
- required: true
- }
- },
data() {
return {
trialId: '',
@@ -226,7 +220,6 @@ export default {
try {
this.loading = true
this.searchData.TrialId = this.trialId
- this.searchData.DataFileType = this.dataFileType
let res = await getSubjectUploadRecordList(this.searchData)
this.loading = false
this.list = res.Result.CurrentPageData
diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/index.vue b/src/views/trials/trials-panel/trial-summary/data-sync/index.vue
index a2f64a43..31cfc317 100644
--- a/src/views/trials/trials-panel/trial-summary/data-sync/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/data-sync/index.vue
@@ -1,23 +1,54 @@
-
+
-
+
+
+ {{ detailDialog.title }}
+ {{`${detailDialog.currentRow.SubjectCode} / ${detailDialog.currentRow.VisitName} ${detailDialog.currentRow.StudyCode ? ' / ' + detailDialog.currentRow.StudyCode : ''} (源:${detailDialog.currentRow.UploadRegion} -> 目标:${detailDialog.currentRow.TargetRegion})`}}
+
+