From 8abcfcbe1a17af0faa3603a3bf3e4e7f9616814a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 11 Sep 2024 13:03:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?qc=E8=B4=A8=E6=8E=A7=E6=96=87=E6=9C=AC?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../visit/qc-check/components/qualityAssurance.vue | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 38e72f9c..d79e3da8 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1640,19 +1640,15 @@ export default {
this.qcForm.qcContent.forEach((item) => {
if (item.isSelect) {
types.push(`${item.keyName}`)
- var str = `${item.keyName}
`
+ var str = `${item.keyName}
`
if (item.keyValue) {
// 问题总结
- str = `${str}${this.$t('trials:audit:form:questionSummary')}:
${
- item.keyValue
- }
`
+ str = `${str}${this.$t('trials:audit:form:questionSummary')}:
${item.keyValue}
`
}
if (item.actionContent) {
// 行动事项
actions.push(`${item.actionContent}`)
- str = `${str}${this.$t('trials:audit:form:actionMatters')}:
${
- item.actionContent
- }
`
+ str = `${str}${this.$t('trials:audit:form:actionMatters')}:
${item.actionContent}
`
}
contents.push(str)
}
From db5e5da06a60608032742279815e85f660064711 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 11 Sep 2024 14:36:45 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=B8=B2=E6=9F=93bug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/trial-summary/audit-record/index.vue | 9 +++++----
1 file changed, 5 insertions(+), 4 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 8b622ae3..9d49a455 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
@@ -652,9 +652,9 @@
/>
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}
+ {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}
@@ -378,9 +378,9 @@
{{$t('trials:auditRecord:title:viewDetail')}}
-
+
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}
+ {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}
@@ -409,9 +409,9 @@
:key="'tableList' + index"
>
-
+
- {{$t('trials:auditRecord:title:viewImage')}}
+ {{$t('trials:auditRecord:title:viewImage')}}
{{scope.row[item.ColumnValue]}}
@@ -426,9 +426,9 @@
:key="'ChildrenList' + index"
>
-
+
-
+
{{$t('trials:auditRecord:title:viewImage')}}
@@ -897,19 +897,22 @@ export default {
this.getList()
},
methods: {
- openImage(url) {
+ openImage(url, type) {
console.log(url)
this.$nextTick(()=>{
if (url instanceof Array) {
this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
- this.$refs[url[0]].$viewer.show()
+ let refName = type ? `${url[0]}_${type}` : url[0]
+ this.$refs[refName].$viewer.show()
} else {
this.imagesList = [this.OSSclientConfig.basePath + url]
if(this.$refs[url] instanceof Array){
- this.$refs[url][0].$viewer.show()
+ let refName = type ? `${url}_${type}` : url
+ this.$refs[refName][0].$viewer.show()
}else{
- this.$refs[url].$viewer.show()
+ let refName = type ? `${url}_${type}` : url
+ this.$refs[refName].$viewer.show()
}
}
})
From 9e83d51037f2639986b8c2250fd314a249a0b53b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 11 Sep 2024 16:22:12 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
=?UTF-8?q?=E6=9E=90=E4=B8=8A=E4=BC=A0=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../visit/consistency-check/components/uploadExcel.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
index 7cb3363c..ca2ad298 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
@@ -9,7 +9,7 @@
Date: Wed, 11 Sep 2024 17:00:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=B5=8B=E8=AF=95=20?=
=?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E6=8E=A5=E5=8F=A3=E5=A4=87?=
=?UTF-8?q?=E6=B3=A8=20vue.config=20=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue.config.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/vue.config.js b/vue.config.js
index 21dac50b..0c5d0e4f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -64,6 +64,7 @@ module.exports = {
// target: 'http://123.56.94.154:7000', // 国内测试环境2
// target: 'http://123.56.94.154:30668',
target: 'http://106.14.89.110:30000',
+ //target: 'http://localhost:3305', // 后端测试环境
// target: 'http://47.117.164.182:7010', // uat
// target: 'http://123.56.181.144:7000',
changeOrigin: true,
From 86c05070b3e693372cf1209fb8ca3662a6ffd8eb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 11 Sep 2024 17:02:17 +0800
Subject: [PATCH 6/6] 1
---
.../reading/medical-feedback/components/FeedbackForm.vue | 4 ++++
.../trials/trials-panel/trial-summary/audit-record/index.vue | 5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
index 33a6899f..69501103 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
@@ -486,9 +486,13 @@ export default {
}
/deep/ .el-upload-list__item {
transition: none !important;
+ width: 140px;
+ height: 140px;
+ margin: 0 10px 5px 0;
}
/deep/ .el-upload-list__item-thumbnail {
/* 图片在方框内显示长边 */
+ width: 100%;
object-fit: scale-down !important;
}
}
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 f831a706..930f385f 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
@@ -907,11 +907,10 @@ export default {
this.$refs[refName].$viewer.show()
} else {
this.imagesList = [this.OSSclientConfig.basePath + url]
- if(this.$refs[url] instanceof Array){
- let refName = type ? `${url}_${type}` : url
+ let refName = type ? `${url}_${type}` : url
+ if(this.$refs[refName] instanceof Array){
this.$refs[refName][0].$viewer.show()
}else{
- let refName = type ? `${url}_${type}` : url
this.$refs[refName].$viewer.show()
}
}