From f58eb07323b42c0acf676719744368833e94dd90 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 9 Oct 2024 16:51:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/uploadDicomAndNonedicom/nonedicomFile.vue | 6 +++---
.../subject/reading-period/components/AddOrEditCD.vue | 2 +-
.../trials/trials-panel/trial-summary/push-record/index.vue | 2 +-
.../visit/crc-upload/components/uploadClinicalData.vue | 2 +-
.../visit/crc-upload/components/uploadNonDicomFiles.vue | 4 ++--
.../visit/crc-upload/components/uploadPetClinicalData.vue | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index a5265399..e0154c1e 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -67,7 +67,7 @@
{{
scope.row.FileSize && scope.row.FileSize > 0
? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
@@ -139,7 +139,7 @@
{{
scope.row.FileSize && scope.row.FileSize > 0
? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
@@ -321,7 +321,7 @@
{{
scope.row.size && scope.row.size > 0
? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
index 2c87a977..1947cd0e 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
@@ -104,7 +104,7 @@
? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
: scope.row.Size && scope.row.Size > 0
? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
diff --git a/src/views/trials/trials-panel/trial-summary/push-record/index.vue b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
index 3d57abc3..a1d69029 100644
--- a/src/views/trials/trials-panel/trial-summary/push-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
@@ -156,7 +156,7 @@
{{
scope.row.FileSize && scope.row.FileSize > 0
? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index 99f4d1d8..092f9e11 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -324,7 +324,7 @@
{{
scope.row.Size && scope.row.Size > 0
? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index cd8611d3..8ec06152 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -75,7 +75,7 @@
{{
scope.row.FileSize && scope.row.FileSize > 0
? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
@@ -409,7 +409,7 @@
{{
scope.row.size && scope.row.size > 0
? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
index d1d48489..c33a7465 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
@@ -329,7 +329,7 @@
{{
scope.row.Size && scope.row.Size > 0
? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
- : 0
+ : ''
}}
From 705585da3806a6fffd0ad0e113af52521f6535d8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 10 Oct 2024 13:57:30 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=A4=8D=E8=AF=B7=E6=B1=82=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dictionary/attachment/index.vue | 41 ++++++++++++++---------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/views/dictionary/attachment/index.vue b/src/views/dictionary/attachment/index.vue
index d80a5d01..5911adf3 100644
--- a/src/views/dictionary/attachment/index.vue
+++ b/src/views/dictionary/attachment/index.vue
@@ -1,12 +1,19 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -24,11 +31,11 @@ export default {
ExportTemplate,
EmailTemplate,
CommonTemplate,
- SignatureTemplate
+ SignatureTemplate,
},
data() {
return {
- activeTab: null
+ activeTab: null,
}
},
mounted() {
@@ -40,25 +47,27 @@ export default {
},
methods: {
clickTab(tab, event) {
- this.$router.push({ path: `/dictionary/attachment?tabActive=${tab.name}` })
- }
- }
+ this.$router.push({
+ path: `/dictionary/attachment?tabActive=${tab.name}`,
+ })
+ },
+ },
}
diff --git a/src/views/dictionary/attachment/components/UploadTemplate/index.vue b/src/views/dictionary/attachment/components/UploadTemplate/index.vue
index 1e6df603..4f497239 100644
--- a/src/views/dictionary/attachment/components/UploadTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/UploadTemplate/index.vue
@@ -118,6 +118,9 @@
+
+ {{ $t('common:button:preview') }}
+
下载
@@ -201,6 +204,17 @@ export default {
})
})
},
+ PreviewFile(row) {
+ let basePath = window.location.origin
+ if (window.location.protocol !== 'https:') {
+ basePath = 'https://irc.test.extimaging.com'
+ }
+ let data = {
+ name: row.NameCN,
+ path: basePath + row.Path,
+ }
+ this.$emit('PreviewFile', data)
+ },
getList() {
this.loading = true
getCommonDocumentList(this.searchData)
diff --git a/src/views/dictionary/attachment/index.vue b/src/views/dictionary/attachment/index.vue
index 5911adf3..3e69e915 100644
--- a/src/views/dictionary/attachment/index.vue
+++ b/src/views/dictionary/attachment/index.vue
@@ -7,8 +7,14 @@
:label="item.label"
:name="String(item.value)"
>
-
-
+
+
+
+
+
+
+
+
From e8f80646f1d2de4c894d6fa0f0578d288e512eb2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 11 Oct 2024 14:58:08 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=AB=98=E5=BA=A6?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dictionary/attachment/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/dictionary/attachment/index.vue b/src/views/dictionary/attachment/index.vue
index 3e69e915..08dd427c 100644
--- a/src/views/dictionary/attachment/index.vue
+++ b/src/views/dictionary/attachment/index.vue
@@ -35,7 +35,7 @@
@@ -43,7 +43,7 @@
v-else-if="excelTypes.includes(Preview.type)"
:src="Preview.path"
:options="options"
- style="height: 80vh"
+ style="height: calc(100vh - 70px)"
@rendered="renderedHandler"
@error="errorHandler"
/>