From 0699b35a0635dc46c1f7c9c5031858facec8d5a2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 7 May 2024 17:33:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/view-study-list.vue | 10 +++++----- .../components/noticeMarquee.vue | 2 +- .../trials-list/components/TrialForm.vue | 11 +++++----- src/views/trials/trials-list/index.vue | 20 +++++++++++++++---- .../trials/trials-panel/hirVisit/index.vue | 13 +++++++++--- .../trials-panel/reading/read-task/index.vue | 16 ++++++++------- .../personnel-manage/components/staff.vue | 8 ++++---- .../personnel-manage/components/staffForm.vue | 6 +++--- .../trials-panel/study/components/list.vue | 6 +++--- .../trial-summary/login-log/index.vue | 8 ++++---- 10 files changed, 61 insertions(+), 39 deletions(-) diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue index 27bd217..123d2e8 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -92,7 +92,7 @@ prop="CalledAE" :label="$t('trials:inspection:table:CalledAE')" show-overflow-tooltip - min-width="140" + min-width="120" > @@ -100,7 +100,7 @@ prop="CallingAE" :label="$t('trials:inspection:table:CallingAE')" show-overflow-tooltip - min-width="140" + min-width="120" > @@ -109,7 +109,7 @@ prop="SeriesCount" :label="$t('trials:audit:table:seriesCount')" show-overflow-tooltip - min-width="140" + min-width="100" sortable="custom" > @@ -118,7 +118,7 @@ prop="InstanceCount" :label="$t('trials:audit:table:instanceCount')" show-overflow-tooltip - min-width="140" + min-width="100" sortable="custom" > @@ -127,7 +127,7 @@ prop="StudyTime" :label="$t('trials:audit:table:studyDate')" show-overflow-tooltip - min-width="140" + min-width="180" sortable="custom" > diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue index 6ddc026..86363d5 100644 --- a/src/views/trials/trials-layout/components/noticeMarquee.vue +++ b/src/views/trials/trials-layout/components/noticeMarquee.vue @@ -4,7 +4,7 @@ ref="mar" hspace="0" direction="left" - width="500" + max-width="500" @mouseout="start()" @mouseover="stop()" > diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index e7aba8a..e4375fc 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -121,6 +121,7 @@ :key="item.Id" :label="item.CriterionName" :value="item.CriterionType" + :title="item.Description" /> @@ -277,11 +278,11 @@ export default { message: `${this.$t("common:ruleMessage:maxLength")} 200`, trigger: "blur", }, - { - pattern: /^[\u4e00-\u9fa5a-zA-Z\/\\]+$/, - message: this.$t("trisals:trials-list:formRule:onlyEN"), - trigger: "blur", - }, + // { + // pattern: /^[\u4e00-\u9fa5a-zA-Z\/\\]+$/, + // message: this.$t("trisals:trials-list:formRule:onlyEN"), + // trigger: "blur", + // }, ], TrialType: [ { diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue index 43fb18b..12dcc25 100644 --- a/src/views/trials/trials-list/index.vue +++ b/src/views/trials/trials-list/index.vue @@ -145,12 +145,14 @@ prop="TrialCode" :label="$t('trials:trials-list:table:trialId')" show-overflow-tooltip + min-width="100" sortable="custom" /> @@ -158,12 +160,14 @@ prop="ExperimentName" :label="$t('trials:trials-list:table:experimentName')" show-overflow-tooltip + min-width="100" sortable="custom" /> @@ -225,20 +229,28 @@ show-overflow-tooltip v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])" /> + + - - + /> --> + - + @@ -184,6 +187,7 @@ :label="$t('trials:trials-panel:table:EarliestScanDate')" show-overflow-tooltip sortable="custom" + min-width="140" /> @@ -238,19 +244,20 @@ prop="SubmitTime" :label="$t('trials:crcUpload:table:submitTime')" show-overflow-tooltip + min-width="100" sortable="custom" /> diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 8041d53..3eb28ae 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -223,7 +223,7 @@ show-overflow-tooltip /> - - + --> diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue index 55665b9..fd53e87 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue @@ -193,21 +193,21 @@ - + /> --> - + /> --> - + /> diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue index 49d389d..32ed739 100644 --- a/src/views/trials/trials-panel/study/components/list.vue +++ b/src/views/trials/trials-panel/study/components/list.vue @@ -94,14 +94,14 @@ height="100" @sort-change="handleSortByColumn" > - + 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 7a405f4..82f404e 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 @@ -151,15 +151,15 @@ {{ $fd("UserType", scope.row.LoginUserTypeEnum) }} - - --> + Date: Wed, 8 May 2024 09:28:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/hospital/uploadLogo.vue | 1 - .../pending-review/components/AuditForm.vue | 286 ++++++++++-------- 2 files changed, 161 insertions(+), 126 deletions(-) diff --git a/src/views/system/hospital/uploadLogo.vue b/src/views/system/hospital/uploadLogo.vue index 99e9c89..2da16e3 100644 --- a/src/views/system/hospital/uploadLogo.vue +++ b/src/views/system/hospital/uploadLogo.vue @@ -186,7 +186,6 @@ export default { this.dialogVisible = true; }, handleRemove(file) { - console.log(1111111111); this.fileList = []; this.$emit("update:path", null); }, diff --git a/src/views/trials/trials-panel/reading/pending-review/components/AuditForm.vue b/src/views/trials/trials-panel/reading/pending-review/components/AuditForm.vue index ce5ca2d..b71166c 100644 --- a/src/views/trials/trials-panel/reading/pending-review/components/AuditForm.vue +++ b/src/views/trials/trials-panel/reading/pending-review/components/AuditForm.vue @@ -8,7 +8,7 @@ :rules="rules" class="audit-form" > - + - + - + + /> - + - {{ $t('trials:medicalFeedback:message:loading') }}... + {{ $t("trials:medicalFeedback:message:loading") + }}... - - {{ $t('common:button:view') }} + + {{ + $t("common:button:view") + }} -