From d56fd2c460baeb85605df5739da7576ff36d0f5a Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 1 Jul 2024 16:03:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/record/record.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue index 6d0d597..3a07482 100644 --- a/src/views/system/record/record.vue +++ b/src/views/system/record/record.vue @@ -690,6 +690,8 @@ export default { .header { background-color: #f1f3f5; padding-top: 10px; + height: calc(100vh - 84px); + ::v-deep .el-tabs__header { margin: 0 !important; @@ -700,9 +702,9 @@ export default { } .bottomheader { - overflow-y: scroll; + height: calc(100vh - 294px); + overflow-y: auto; width: 99%; - height: 67vh; background-color: #fff; margin: 10px auto; padding: 10px 20px; From 9453116a4099fc1926606994c2e494b04c15fd86 Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 1 Jul 2024 17:26:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=95=99=E7=99=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RehabilitationPlanandRecords.vue | 829 ++++++++++-------- .../manage/components/healthEducation.vue | 275 +++--- .../manage/components/indicatorMonitoring.vue | 6 +- .../manage/components/signingRecords.vue | 420 +++++---- src/views/manage/components/visitRecords.vue | 589 +++++++------ 5 files changed, 1185 insertions(+), 934 deletions(-) diff --git a/src/views/manage/components/RehabilitationPlanandRecords.vue b/src/views/manage/components/RehabilitationPlanandRecords.vue index ca52b28..33e866f 100644 --- a/src/views/manage/components/RehabilitationPlanandRecords.vue +++ b/src/views/manage/components/RehabilitationPlanandRecords.vue @@ -1,396 +1,503 @@ diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue index 158fb74..a9fe633 100644 --- a/src/views/manage/components/healthEducation.vue +++ b/src/views/manage/components/healthEducation.vue @@ -1,161 +1,170 @@ diff --git a/src/views/manage/components/indicatorMonitoring.vue b/src/views/manage/components/indicatorMonitoring.vue index 88e14e3..9586572 100644 --- a/src/views/manage/components/indicatorMonitoring.vue +++ b/src/views/manage/components/indicatorMonitoring.vue @@ -229,10 +229,12 @@ export default { } .leftheader { + height: calc(100vh - 352px); + width: 20%; margin-top: 20px; - height: 450px; - overflow: scroll; + // height: 450px; + overflow: auto; // 隐藏表头的滚动条 overflow-x: hidden !important; diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index 7633603..f4584a9 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -1,193 +1,273 @@ \ No newline at end of file diff --git a/src/views/manage/components/visitRecords.vue b/src/views/manage/components/visitRecords.vue index d207b67..fcd3068 100644 --- a/src/views/manage/components/visitRecords.vue +++ b/src/views/manage/components/visitRecords.vue @@ -1,297 +1,350 @@ From b1c59c7abf88156b0b7bf0f4dec47f38ce21d761 Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 1 Jul 2024 17:29:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E6=82=A3=E8=80=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/signRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 43015c9..494639e 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -214,7 +214,7 @@