From 850eea52a541cf0b85c7bab35ba6acd0a4abec79 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 9 May 2022 16:04:37 +0800 Subject: [PATCH 1/3] bug --- src/saas/AppCountryAlbum/AddReport.vue | 17 +- .../AppCountryAlbum/components/WorkReport.vue | 161 +++++++++++++++++- 2 files changed, 171 insertions(+), 7 deletions(-) diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue index 4a940241..210ce5f8 100644 --- a/src/saas/AppCountryAlbum/AddReport.vue +++ b/src/saas/AppCountryAlbum/AddReport.vue @@ -1,11 +1,11 @@ @@ -46,10 +46,17 @@ \ No newline at end of file + diff --git a/src/saas/AppCountryAlbum/components/WorkReport.vue b/src/saas/AppCountryAlbum/components/WorkReport.vue index 37c1e295..0fb374af 100644 --- a/src/saas/AppCountryAlbum/components/WorkReport.vue +++ b/src/saas/AppCountryAlbum/components/WorkReport.vue @@ -1,6 +1,36 @@ @@ -8,6 +38,8 @@ export default { name: 'WorkReport', + label: '工作汇报', + data () { return { @@ -25,5 +57,130 @@ \ No newline at end of file + * { + box-sizing: border-box; + } + + .top { + display: flex; + justify-content: space-between; + align-items: center; + padding: 8px 0; + width: 686px; + color: #333333; + font-size: 32px; + border-bottom: 4px solid #E3464B; + } + + .body { + margin-top: 8px; + + h2 { + font-size: 112px; + color: #E3464B; + font-weight: 600; + text-align: center; + border-top: 2px solid #E3464B; + } + + .subtitle { + margin-top: 8px; + margin-bottom: 10px; + height: 60px; + line-height: 60px; + border-radius: 30px; + color: #E3464B; + font-size: 32px; + text-align: center; + border: 3px solid #E3464B; + } + + .partition { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 100%; + + div { + position: relative; + z-index: 1; + padding: 0 6px; + background: #F6F4F0; + + i { + display: block; + width: 10px; + height: 10px; + border-radius: 50%; + background: #E3464B; + } + } + + &::after { + position: absolute; + left: 0; + top: 50%; + width: 100%; + height: 2px; + background: #E3464B; + transform: translateY(-50%); + content: ''; + } + } + } + + .bottom { + margin-top: 6px; + padding-top: 16px; + border-top: 4px solid #E3464B; + + .bottom-item__wrapper { + .bottom-item { + display: flex; + line-height: 44px; + margin-bottom: 16px; + color: #333333; + font-size: 32px; + + &:last-child { + margin-bottom: 0; + } + } + } + + .add { + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + height: 480px; + margin-top: 32px; + background: #FFFFFF; + border-radius: 8px; + + .add-btn { + display: flex; + align-items: center; + justify-content: center; + width: 232px; + height: 80px; + color: #FFFFFF; + font-size: 32px; + background: #408EF6; + border-radius: 40px; + + &:last-child { + margin-top: 48px; + color: #408EF6; + background: #E7F5FE; + } + } + } + } + } + From a705f05e21e78e49112eb6d1c221dedaa1cac6ba Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 9 May 2022 17:45:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/saas/AppCountryAlbum/components/Daily.vue | 138 +++++++++++++++++- .../AppCountryAlbum/components/WorkReport.vue | 1 - 2 files changed, 134 insertions(+), 5 deletions(-) diff --git a/src/saas/AppCountryAlbum/components/Daily.vue b/src/saas/AppCountryAlbum/components/Daily.vue index 54390e7f..cefdf8be 100644 --- a/src/saas/AppCountryAlbum/components/Daily.vue +++ b/src/saas/AppCountryAlbum/components/Daily.vue @@ -1,12 +1,43 @@ \ No newline at end of file + * { + box-sizing: border-box; + } + + .top { + display: flex; + align-items: center; + padding: 8px 0 16px; + color: #333333; + font-size: 32px; + border-bottom: 4px solid #000; + } + + .body { + margin-top: 16px; + + h2 { + font-size: 68px; + color: #333; + font-weight: 600; + } + + .subtitle { + margin-top: 24px; + margin-bottom: 24px; + color: #000; + font-size: 34px; + } + } + + .bottom { + margin-top: 24px; + + .bottom-item__wrapper { + .bottom-item { + display: flex; + justify-content: space-between; + line-height: 64px; + margin-bottom: 16px; + padding: 0 16px; + color: #fff; + font-size: 28px; + background: #D84A36; + + i { + font-style: normal; + } + + &:last-child { + height: auto; + line-height: 1.3; + padding: 12px 16px; + margin-bottom: 0; + color: #D84A36; + font-size: 28px; + text-align: justify; + border: 3px solid #DB6352; + background: #fff; + + span { + flex: 1; + } + } + } + } + + .add { + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + height: 480px; + margin-top: 32px; + background: #F7F7F7; + border-radius: 8px; + + .add-btn { + display: flex; + align-items: center; + justify-content: center; + width: 232px; + height: 80px; + color: #FFFFFF; + font-size: 32px; + background: #408EF6; + border-radius: 40px; + + &:last-child { + margin-top: 48px; + color: #408EF6; + background: #E7F5FE; + } + } + } + } + } + diff --git a/src/saas/AppCountryAlbum/components/WorkReport.vue b/src/saas/AppCountryAlbum/components/WorkReport.vue index 0fb374af..e66c4676 100644 --- a/src/saas/AppCountryAlbum/components/WorkReport.vue +++ b/src/saas/AppCountryAlbum/components/WorkReport.vue @@ -70,7 +70,6 @@ justify-content: space-between; align-items: center; padding: 8px 0; - width: 686px; color: #333333; font-size: 32px; border-bottom: 4px solid #E3464B; From cc31988381bbb0cc15387ccf6e636a4b552c7dfe Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 9 May 2022 18:07:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/saas/AppCountryAlbum/components/Daily.vue | 8 +- .../AppCountryAlbum/components/InspectLog.vue | 134 +++++++++++++++++- 2 files changed, 136 insertions(+), 6 deletions(-) diff --git a/src/saas/AppCountryAlbum/components/Daily.vue b/src/saas/AppCountryAlbum/components/Daily.vue index cefdf8be..1e6cdf33 100644 --- a/src/saas/AppCountryAlbum/components/Daily.vue +++ b/src/saas/AppCountryAlbum/components/Daily.vue @@ -1,5 +1,5 @@