From 272f2615a6bb03e255cbc619e8a31a3ad0189666 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 18:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/AddReport.vue  | 37 +++++++++++++++++--------
 src/saas/AppCountryAlbum/Attendance.vue |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 40fd15f2..ce398ce9 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -2,12 +2,15 @@
   <div class="report">
     <components class="report-item" ref="reportItem" :config="currConfig" v-if="currConfig.length" :is="component"></components>
     <div class="report-list" data-html2canvas-ignore>
-      <image
-        v-for="(item, index) in configList"
-        :src="item.thum"
+      <div
+        class="report-item"
         :key="index"
+        v-for="(item, index) in configList"
         :class="[currIndex === index ? 'active' : '']"
-        @click="changeComponent(item, index)" />
+        @click="changeComponent(item, index)">
+        <image class="img" :src="item.thum" />
+        <image class="checked" v-if="currIndex === index" src="./images/xuanzhong.png" />
+      </div>
     </div>
     <div class="report-btn" data-html2canvas-ignore @click="save">完成</div>
   </div>
@@ -150,7 +153,7 @@
     .report-list {
       position: fixed;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       align-items: center;
       left: 0;
       bottom: 0;
@@ -159,18 +162,30 @@
       padding: 0 24px;
       background: #FFFFFF;
 
-      image {
-        width: 156px;
+      .report-item {
+        position: relative;
+        width: 176px;
         height: 208px;
-        margin-right: 16px;
         border: 4px solid transparent;
 
-        &:last-child {
-          margin-right: 0;
+        .img {
+          width: 100%;
+          height: 208px;
+        }
+
+        .checked {
+          position: absolute;
+          top: 0;
+          right: 0;
+          z-index: 1;
+          width: 64px;
+          height: 64px;
         }
 
         &.active {
-          border: 4px solid #408EF6;
+          .img {
+            border: 4px solid #408EF6;
+          }
         }
       }
     }
diff --git a/src/saas/AppCountryAlbum/Attendance.vue b/src/saas/AppCountryAlbum/Attendance.vue
index c57465dc..b4704caf 100644
--- a/src/saas/AppCountryAlbum/Attendance.vue
+++ b/src/saas/AppCountryAlbum/Attendance.vue
@@ -22,7 +22,7 @@
           <span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">已出勤 {{ attendanceCount.hasIn || 0 }}</span>
           <span @click="changeTab(2)" :class="[currIndex === 2 ? 'active' : '']">未出勤 {{ attendanceCount.hasOut || 0 }}</span>
         </div>
-        <div class="right" @click="linkTo('./AttendanceSetting')" v-if="isAdmin">考勤设置</div>
+        <div class="right" @click="linkTo('./AttendanceSetting')" v-if="!isAdmin">考勤设置</div>
       </div>
       <div class="info-table">
         <div class="table-header">