From 0d376a23b8873b145ed33d4ff8f24609d13fc3d9 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 14 Jun 2024 17:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/footer-nav/index.vue | 2 +- src/views/Home.vue | 20 ++++++-- src/views/HomeWx.vue | 9 ++++ src/views/administrative/appointment.vue | 16 ++++-- src/views/administrative/appointmentList.vue | 14 +++--- src/views/administrative/userFilter.vue | 8 +-- src/views/common/analyse.vue | 2 +- src/views/enforce/assistUserFilter.vue | 8 +-- src/views/enforce/earlyWarning.vue | 16 +++--- src/views/enforce/enforceNotice.vue | 15 +++--- src/views/enforce/enforcementPlan.vue | 14 +++--- src/views/enforce/enforcementPlanAdd.vue | 16 ++++-- src/views/enforce/enterpriseBaseInfo.vue | 2 +- src/views/enforce/enterpriseWarningInfo.vue | 6 +-- src/views/enforce/historyCheck.vue | 16 +++--- src/views/enforce/noScan.vue | 7 +-- src/views/enforce/userFilter.vue | 4 +- src/views/enforce/zqyjjdmFilter.vue | 4 +- src/views/enforceHome.vue | 34 ++++++++----- src/views/enterprise/caseFilter.vue | 6 +-- src/views/enterprise/companyFilter.vue | 4 +- src/views/enterprise/complaint.vue | 6 +-- src/views/enterprise/complaintList.vue | 6 +-- src/views/enterprise/complaintNoScan.vue | 6 +-- .../enterprise/enterpriseInspectionDetail.vue | 19 ++++--- .../enterprise/enterpriseInspectionList.vue | 16 +++--- src/views/enterprise/qrCode.vue | 50 +++++++++++++------ src/views/enterprise/qrCodeHistory.vue | 4 +- src/views/enterprise/registrationDetail.vue | 4 +- src/views/enterprise/registrationList.vue | 16 +++--- .../enterprise/registrationSelectList.vue | 4 +- 31 files changed, 218 insertions(+), 136 deletions(-) diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue index 6faab51..c157f19 100644 --- a/src/components/footer-nav/index.vue +++ b/src/components/footer-nav/index.vue @@ -4,7 +4,7 @@ {{ $t("common.lang_home") }} - + 行政检查通知 -
+
@@ -95,12 +95,12 @@ show-word-limit /> -
+ 保存 提交 -
+
@@ -455,6 +455,16 @@ background-color: #f4f4f4; } + .warp_body { + margin: 0; + padding-bottom: 3rem; + width: 100%; + height: 100%; + /*background-image: linear-gradient(to bottom, #ebf3fb, #fff);*/ + overflow-y: auto; + margin-top: 1%; + } + /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ .van-popup.van-toast { background: var(--van-toast-background) !important; diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 8fbe471..94c1774 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -395,7 +395,7 @@ align-items: center; margin: 2% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -423,7 +423,7 @@ } .search-button-list { - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; @@ -441,12 +441,13 @@ .search-button.active { background-color: #1367fe; + border-color: #1367fe; color: #fff; } } .search-button-date { - height: 3%; + height: 0.65rem; display: flex; flex-direction: row; padding-left: 10px; @@ -464,11 +465,12 @@ } .search-button { - width: 15%; - height: 90%; position: absolute; top: 1%; right: 3%; + width: 15%; + height: 100%; + font-size: 0.3rem; } } @@ -484,7 +486,7 @@ } /deep/ .card_box_span:nth-child(2) p { - font-size: 0.42rem; + font-size: 0.40rem; font-weight: bold; white-space: nowrap; overflow: hidden; diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue index 391ab04..397537b 100644 --- a/src/views/administrative/userFilter.vue +++ b/src/views/administrative/userFilter.vue @@ -95,7 +95,7 @@ export default { border-bottom: 1px solid #f3f4f5; text-align: center; font-size: 0.42rem; - font-weight: 550; + font-weight: 600; } .close-button { @@ -197,7 +197,7 @@ export default { padding: 0; width: 60%; color: #fff; - font-size: 0.35rem; + font-size: 0.38rem; border-radius: 1rem; background: #1367fe; border: 1px solid #1367fe; @@ -220,7 +220,7 @@ export default { margin: 3% 2%; padding: 2% 0; width: 96%; - font-size: 0.3rem; + font-size: 0.35rem; border-bottom: 1px solid #f4f4f4; color: #999; line-height: 2; @@ -228,7 +228,7 @@ export default { .case-title { margin: 2% 0; - font-size: 0.38rem; + font-size: 0.42rem; color: #333; line-height: 1.25; } diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue index 88baab2..f25d708 100644 --- a/src/views/common/analyse.vue +++ b/src/views/common/analyse.vue @@ -490,7 +490,7 @@ .countbox span.count-tit { color: #666; - font-size: 0.42rem; + font-size: 0.40rem; } .countbox span.count-tot { diff --git a/src/views/enforce/assistUserFilter.vue b/src/views/enforce/assistUserFilter.vue index 5a87c72..eb7ed27 100644 --- a/src/views/enforce/assistUserFilter.vue +++ b/src/views/enforce/assistUserFilter.vue @@ -102,7 +102,7 @@ export default { border-bottom: 1px solid #f3f4f5; text-align: center; font-size: 0.42rem; - font-weight: 550; + font-weight: 600; } .close-button { @@ -204,7 +204,7 @@ export default { padding: 0; width: 60%; color: #fff; - font-size: 0.35rem; + font-size: 0.38rem; border-radius: 1rem; background: #1367fe; border: 1px solid #1367fe; @@ -227,7 +227,7 @@ export default { margin: 3% 2%; padding: 2% 0; width: 96%; - font-size: 0.3rem; + font-size: 0.35rem; border-bottom: 1px solid #f4f4f4; color: #999; line-height: 2; @@ -235,7 +235,7 @@ export default { .case-title { margin: 2% 0; - font-size: 0.38rem; + font-size: 0.42rem; color: #333; line-height: 1.25; } diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index da0a83c..8101d7d 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -316,7 +316,7 @@ align-items: center; margin: 1% 0; padding: 0 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -344,7 +344,7 @@ } .search-button-list { - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; @@ -362,12 +362,13 @@ .search-button.active { background-color: #1367fe; + border-color: #1367fe; color: #fff; } } .search-button-date { - height: 3%; + height: 0.65rem; display: flex; flex-direction: row; padding-left: 10px; @@ -385,11 +386,12 @@ } .search-button { - width: 15%; - height: 80%; position: absolute; top: 1%; - right: 1%; + right: 3%; + width: 15%; + height: 100%; + font-size: 0.3rem; } } @@ -411,7 +413,7 @@ .card-title p { width: calc(100% - 1rem); - font-size: 0.42rem; + font-size: 0.40rem; font-weight: bold; /*white-space: nowrap; overflow: hidden; diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue index 66df585..1d13246 100644 --- a/src/views/enforce/enforceNotice.vue +++ b/src/views/enforce/enforceNotice.vue @@ -291,7 +291,7 @@ const toPdfView = (url) =>{ align-items: center; margin: 2% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -317,7 +317,7 @@ const toPdfView = (url) =>{ } .search-button-list{ - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; @@ -386,13 +386,13 @@ const toPdfView = (url) =>{ .item-cont { display: inline-block; - width: calc(100% - 2.25rem); + width: calc(100% - 2.0rem); } .item-time { float: left; - margin-right: 2%; - width: 98%; + margin: 2% 0; + width: 100%; color: #c1bfbf; font-size: 0.3rem; //height: 0.75rem; @@ -401,10 +401,11 @@ const toPdfView = (url) =>{ .item-title, .item-text { float: left; + margin: 0; width: 100%; - font-size: 0.42rem; + font-size: 0.40rem; font-weight: 600; - line-height: 0.75rem; + line-height: 1.5; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index e203efd..b7b6411 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -347,7 +347,7 @@ align-items: center; margin: 1% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -375,7 +375,7 @@ } .search-button-list { - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; @@ -393,12 +393,13 @@ .search-button.active { background-color: #1367fe; + border-color: #1367fe; color: #fff; } } .search-button-date { - height: 3%; + height: 0.65rem; display: flex; flex-direction: row; padding-left: 10px; @@ -416,11 +417,12 @@ } .search-button { - width: 15%; - height: 90%; position: absolute; top: 1%; right: 3%; + width: 15%; + height: 100%; + font-size: 0.3rem; } } /deep/ .van-search__content { @@ -453,7 +455,7 @@ } .card-title p { - font-size: 0.42rem; + font-size: 0.40rem; font-weight: bold; white-space: nowrap; overflow: hidden; diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 722c486..94915b9 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -1,14 +1,14 @@ @@ -226,35 +228,53 @@ const toHisrotyView = () =>{ overflow: hidden; background-color: #f4f4f4; } -.warp_body{ - .qr_code{ +.warp_body { + margin: 0; + .white-body { + display: flex; + margin: 0; + width: 100%; + height: 100%; + background-color: #fff; + align-items: center; + } + .qr_code { width: 100%; height: 60%; background-color:white; position: relative; margin-top: 1%; - .qr_code_img{ + .qr_code_img { + position: relative; + top: 2%; + left: 10%; width: 80%; height: 70%; - top: 8%; - left: 10%; - position: absolute; } - .qr_code_text{ + .qr_code_text { display: block; - font-size: 12px; - position: absolute; - bottom: 4%; - left: 20%; + position: relative; + top: 3%; + width: 100%; + color: #999; + font-size: 0.3rem; + text-align: center; + line-height: 3; } - .qr_name{ - position: absolute; + .qr_name { + position: relative; width: 100%; height: 10%; top: 3%; text-align: center; - font-size: 16px; + font-size: 0.42rem; } } } + +/deep/ .van-image__img { + display: block; + width: 100%; + height: auto; +} diff --git a/src/views/enterprise/qrCodeHistory.vue b/src/views/enterprise/qrCodeHistory.vue index 12577f8..030159e 100644 --- a/src/views/enterprise/qrCodeHistory.vue +++ b/src/views/enterprise/qrCodeHistory.vue @@ -340,7 +340,7 @@ const cancelSelectDate = () =>{ align-items: center; margin: 2% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -366,7 +366,7 @@ const cancelSelectDate = () =>{ } .search-button-list{ - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 0a87d7f..36312b5 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -82,8 +82,8 @@ rows="2" autosize type="textarea" - maxlength="50" - placeholder="请输入备注" + maxlength="" + placeholder="" show-word-limit readonly /> diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index a2a77f0..74649a4 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -403,7 +403,7 @@ align-items: center; margin: 2% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -430,7 +430,7 @@ } .search-button-list { - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px; @@ -448,12 +448,13 @@ .search-button.active { background-color:#1367fe; + border-color: #1367fe; color: #fff; } } .search-button-date { - height: 3%; + height: 0.65rem; display: flex; flex-direction: row; padding-left: 10px; @@ -471,11 +472,12 @@ } .search-button { - width: 15%; - height: 80%; position: absolute; top: 1%; - right: 1%; + right: 3%; + width: 15%; + height: 100%; + font-size: 0.3rem; } } @@ -498,7 +500,7 @@ } /deep/ .card_box_span:nth-child(2) p { - font-size: 0.42rem; + font-size: 0.40rem; font-weight: bold; white-space: nowrap; overflow: hidden; diff --git a/src/views/enterprise/registrationSelectList.vue b/src/views/enterprise/registrationSelectList.vue index 4b3cf17..4093c33 100644 --- a/src/views/enterprise/registrationSelectList.vue +++ b/src/views/enterprise/registrationSelectList.vue @@ -337,7 +337,7 @@ const oneCheckbox = (item) => { align-items: center; margin: 2% 0; padding-left: 3%; - font-size: 0.38rem; + font-size: 0.35rem; line-height: 1.5; p { @@ -363,7 +363,7 @@ const oneCheckbox = (item) => { } .search-button-list { - height: 3%; + height: 0.7rem; display: flex; flex-direction: row; padding-left: 10px;