From 9d47ae2561265904c262c3f2d595a9ac52b3ac3e Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 27 Mar 2024 13:58:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E9=86=92=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dcmUpload/anonymization.js | 2 +- .../crc-upload/components/uploadDicomFiles2.vue | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/utils/dcmUpload/anonymization.js b/src/utils/dcmUpload/anonymization.js index a018d399..30e805ed 100644 --- a/src/utils/dcmUpload/anonymization.js +++ b/src/utils/dcmUpload/anonymization.js @@ -54,7 +54,7 @@ export const anonymization = function (file, config) { } } } - console.log(dataset) + // console.log(dataset) let newDicomFile = dataset.write() const bufferArray = new Uint8Array(newDicomFile) const blob = new Blob([bufferArray], { type: 'application/octet-stream' }) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index 3620c002..0429300e 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -581,7 +581,8 @@ export default { trialBodyPartTypes: [], trialModalitys: [], myInterval: [], - studyErrorList: [] + studyErrorList: [], + confirmFlag:false } }, mounted() { @@ -669,8 +670,10 @@ export default { cancelButtonText: this.$t("common:button:cancel"), type: 'warning' }).then(() => { + this.confirmFlag = false; this.$emit("update:activeName",'clinical-data'); - }).catch(() => { + }).catch(() => { + this.confirmFlag = false; }); }else{ if(showConfirm) return; @@ -940,7 +943,7 @@ export default { beginUploadQueues() { this.scanState = 'uploading' this.studyErrorList = [] - console.log(this.uploadQueues, this.selectArr) + // console.log(this.uploadQueues, this.selectArr) this.warningArr = [] for (let i = 0; i < this.selectArr.length; ++i) { const index = this.selectArr[i].studyIndex @@ -1078,6 +1081,7 @@ export default { }) this.$refs.pathClear.value = '' this.btnLoading = false + // console.log(11111); if (this.studyErrorList.length > 0) { let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList') msg = msg.replaceAll('xxx', this.studyErrorList.join('、')) @@ -1087,6 +1091,9 @@ export default { this.beginUploadQueues() }) } + if(this.confirmFlag){ + this.getClinicalData(true); + } }) }).catch(_ => { this.btnLoading = false }) }, @@ -1378,7 +1385,7 @@ export default { let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT'; // let flag = params.study.seriesList.some(item=>item.modality==='PT'); if(flag){ - scope.getClinicalData(true); + scope.confirmFlag = true; } scope.getStudyInfo() if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') { From 05bc41f5e2286cb5dc14b0559438ffa1c8f157c0 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 27 Mar 2024 13:58:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/trial-summary/login-log/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue index ed72ab3c..e42c483d 100644 --- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue +++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue @@ -156,7 +156,7 @@ const searchDataDefault = () => { LoginFaildName: '', BeginDate: '', EndDate: '', - Asc: true, + Asc: false, SortField: '', PageIndex: 1, PageSize: 20 From 5e2522147fe90c8988a3c7bf38ec90369295f941 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 27 Mar 2024 14:32:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-workbench/components/NeedSignedTrialDoc.vue | 8 ++++++-- .../trials/trials-workbench/components/needSignSysDoc.vue | 8 ++++++-- .../trials-workbench/components/needSignedSysDoc.vue | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue index e141696b..bd102f68 100644 --- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue +++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue @@ -21,6 +21,7 @@ v-adaptive="{bottomOffset:45}" height="100" @sort-change="handleSortByColumn" + :default-sort ="{prop: 'ConfirmTime', order: 'descending'}" > @@ -48,16 +49,19 @@ :label="$t('trials:sysDocBeSigned:table:fileType')" prop="FileType" show-overflow-tooltip + sortable="custom" /> { IsSigned: true, pageIndex: 1, pageSize: 20, - asc: true, - sortField: '' + asc: false, + sortField: 'ConfirmTime' } } export default { diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue index 4ee9f3b0..3f9f81e8 100644 --- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue @@ -21,22 +21,26 @@ v-adaptive="{bottomOffset:45}" height="100" @sort-change="handleSortByColumn" + :default-sort ="{prop: 'UpdateTime', order: 'descending'}" > { return { pageIndex: 1, pageSize: 20, - asc: true, - sortField: '' + asc: false, + sortField: 'UpdateTime' } } export default { diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue index 816f3502..31e97e91 100644 --- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue @@ -21,22 +21,26 @@ v-adaptive="{bottomOffset:45}" height="100" @sort-change="handleSortByColumn" + :default-sort ="{prop: 'UpdateTime', order: 'descending'}" > { return { pageIndex: 1, pageSize: 20, - asc: true, - sortField: '' + asc: false, + sortField: 'UpdateTime' } } export default { From 1724e020f6f89468c49f9dc71a69337cb6716d79 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 27 Mar 2024 14:39:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/trial-summary/audit-record/index.vue | 3 ++- .../trials/trials-panel/trial-summary/login-log/index.vue | 8 +++++++- .../trials-panel/trial-summary/upload-monitor/index.vue | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue index e50e3a3b..0b99516d 100644 --- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue @@ -117,6 +117,7 @@ @sort-change="handleSortChange" stripe height="100" + :default-sort ="{prop: 'CreateTime', order: 'descending'}" > @@ -748,7 +749,7 @@ export default { data() { const searchDataDefault = () => { return { - SortField: '', + SortField: 'CreateTime', Asc: false, PageIndex: 1, PageSize: 20, diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue index e42c483d..ce24e71f 100644 --- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue +++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue @@ -69,6 +69,7 @@ :data="list" class="table" @sort-change="handleSortByColumn" + :default-sort ="{prop: 'CreateTime', order: 'descending'}" >