From da0ec92b78a9ff5ff16cb354c02a75cc55a12d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B1=B3=E5=AD=90=E8=B1=AA?= <1012743329@qq.com>
Date: Fri, 10 Jan 2025 10:48:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=201.=E6=98=9F=E5=AF=93=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E6=A8=A1=E5=9D=97--=E8=80=83=E5=8B=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 ++
 src/pages/attendance/allowed-time.vue         | 12 +++
 .../attendance-add-group.vue                  |  6 ++
 .../attendance-device.vue                     | 95 +++++++++++++++++++
 .../attendance-add-group/special-date-set.vue | 72 +++++++-------
 src/pages/attendance/classes-manage.vue       |  5 +-
 6 files changed, 159 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/attendance/attendance-add-group/attendance-device.vue

diff --git a/src/App.vue b/src/App.vue
index c22e5e4..ca335be 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,4 +36,13 @@
     height: 100%;
     vertical-align: middle;
   }
+  .uni-scroll-view-refresher {
+    background-color: transparent !important;
+  }
+  .wd-tabs__nav {
+    background-color: transparent !important;
+  }
+  .wd-tabs {
+    background-color: transparent !important;
+  }
 </style>
diff --git a/src/pages/attendance/allowed-time.vue b/src/pages/attendance/allowed-time.vue
index ce78681..94610c8 100644
--- a/src/pages/attendance/allowed-time.vue
+++ b/src/pages/attendance/allowed-time.vue
@@ -56,6 +56,18 @@
   import CommonItem from '@/components/CommonItemItem/CommonItem.vue'
 
   const times = ref([
+    {
+      times: ['07:00', '09:00'],
+      switch: [true, false]
+    },
+    {
+      times: ['07:00', '09:00'],
+      switch: [true, false]
+    },
+    {
+      times: ['07:00', '09:00'],
+      switch: [true, false]
+    },
     {
       times: ['07:00', '09:00'],
       switch: [true, false]
diff --git a/src/pages/attendance/attendance-add-group/attendance-add-group.vue b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
index 9f2ef00..fc3bab1 100644
--- a/src/pages/attendance/attendance-add-group/attendance-add-group.vue
+++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
@@ -135,6 +135,7 @@
         :value="wayList[wayIndex].title"
       ></CommonItem>
       <CommonItem
+        @click="goDevice"
         text="打卡设备"
         :isMust="wayIndex == 0"
         :noLine="wayIndex == 0"
@@ -218,6 +219,11 @@
       url: '/pages/attendance/attendance-add-group/attendance-time'
     })
   }
+  const goDevice = () => {
+    uni.navigateTo({
+      url: '/pages/attendance/attendance-add-group/attendance-device'
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/attendance/attendance-add-group/attendance-device.vue b/src/pages/attendance/attendance-add-group/attendance-device.vue
new file mode 100644
index 0000000..ac383b1
--- /dev/null
+++ b/src/pages/attendance/attendance-add-group/attendance-device.vue
@@ -0,0 +1,95 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation title="选择考勤机/门禁点"></TopNavigation>
+    <view class="bg-white flex flex flex-row flex-justify-center items-center rounded-1 m-3 p-1.5">
+      <wd-icon name="search" class="color-gray text-3.3 ml-2"></wd-icon>
+      <view class="color-gray ml-2">搜索</view>
+    </view>
+    <view class="m-3 mt-2 color-gray">全部</view>
+    <scroll-view scroll-y>
+      <view
+        v-for="(device, index) in deviceList"
+        :key="index"
+        class="bg-white px-3 py-2 flex flex-row items-center border-solid border-0 border-t-1 border-gray-100"
+      >
+        <view
+          @click="
+            () => {
+              if (selectIndex == index) {
+                selectIndex = -1
+              } else {
+                selectIndex = index
+              }
+            }
+          "
+          class="text-5"
+          :class="
+            selectIndex == index
+              ? 'i-carbon-checkmark-filled color-[#3372FA]'
+              : 'i-carbon-circle-outline color-gray'
+          "
+        ></view>
+        <image src="/static/images/icon_one_key_door.png" mode="aspectFit" class="h-9 w-11" />
+        <view>{{ device.name }}</view>
+        <view class="ml-a color-gray">{{ device.type }}</view>
+      </view>
+    </scroll-view>
+    <view class="p-3 box-border border-solid border-0 border-t-1 border-gray-200 text-end">
+      <wd-button :round="false">确定</wd-button>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue'
+  const selectIndex = ref(0)
+  const deviceList = ref([
+    {
+      name: 'DK-K(L40231232)',
+      type: '公共门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    },
+    {
+      name: 'DK-K(L40231233)',
+      type: '私人门'
+    }
+
+    // Add more devices as needed
+  ])
+</script>
+
+<style lang="scss" scoped>
+  //
+</style>
diff --git a/src/pages/attendance/attendance-add-group/special-date-set.vue b/src/pages/attendance/attendance-add-group/special-date-set.vue
index 5c975ff..ef38cb4 100644
--- a/src/pages/attendance/attendance-add-group/special-date-set.vue
+++ b/src/pages/attendance/attendance-add-group/special-date-set.vue
@@ -15,46 +15,44 @@
         <wd-tab :title="item.title"></wd-tab>
       </block>
     </wd-tabs>
-    <view class="flex-1 flex flex-col p-3">
-      <scroll-view scroll-y class="flex-1 box-border">
-        <view class="bg-white rounded-2">
-          <CommonItem
-            text="添加"
-            @click="
-              tabsIndex == 0 ? mustDate.push(cloneBestDate()) : unMustDate.push(cloneBestDate())
-            "
-          >
-            <template v-slot:child>
-              <wd-icon name="add-circle" class="ml-a" size="18"></wd-icon>
-            </template>
-          </CommonItem>
-        </view>
-        <view
-          class="mt-5"
-          v-for="(item, index) in tabsIndex == 0 ? mustDate : unMustDate"
-          :key="index"
+    <scroll-view scroll-y class="flex-1 box-border p-3">
+      <view class="bg-white rounded-2">
+        <CommonItem
+          text="添加"
+          @click="
+            tabsIndex == 0 ? mustDate.push(cloneBestDate()) : unMustDate.push(cloneBestDate())
+          "
         >
-          <view class="flex flex-justify-between px-3 mb-2">
-            <view class="color-gray text-3">{{ tabs[tabsIndex].title }}({{ index + 1 }})</view>
-            <view
-              @click="tabsIndex == 0 ? mustDate.splice(index, 1) : unMustDate.splice(index, 1)"
-              class="color-red text-3"
-            >
-              删除
-            </view>
-          </view>
-          <view class="bg-white rounded-2">
-            <CommonItem text="日期" :value="item.data" :noLine="tabsIndex != 0"></CommonItem>
-            <CommonItem
-              v-show="tabsIndex == 0"
-              text="上下班时间"
-              :value="item.time"
-              noLine
-            ></CommonItem>
+          <template v-slot:child>
+            <wd-icon name="add-circle" class="ml-a" size="18"></wd-icon>
+          </template>
+        </CommonItem>
+      </view>
+      <view
+        class="mt-5"
+        v-for="(item, index) in tabsIndex == 0 ? mustDate : unMustDate"
+        :key="index"
+      >
+        <view class="flex flex-justify-between px-3 mb-2">
+          <view class="color-gray text-3">{{ tabs[tabsIndex].title }} ({{ index + 1 }})</view>
+          <view
+            @click="tabsIndex == 0 ? mustDate.splice(index, 1) : unMustDate.splice(index, 1)"
+            class="color-red text-3"
+          >
+            删除
           </view>
         </view>
-      </scroll-view>
-    </view>
+        <view class="bg-white rounded-2">
+          <CommonItem text="日期" :value="item.data" :noLine="tabsIndex != 0"></CommonItem>
+          <CommonItem
+            v-show="tabsIndex == 0"
+            text="上下班时间"
+            :value="item.time"
+            noLine
+          ></CommonItem>
+        </view>
+      </view>
+    </scroll-view>
     <view class="mt-a w-full p-3 box-border border-solid border-0 border-t-1 border-gray-200">
       <wd-button :round="false" block>确定</wd-button>
     </view>
diff --git a/src/pages/attendance/classes-manage.vue b/src/pages/attendance/classes-manage.vue
index f4b2ccc..2272aad 100644
--- a/src/pages/attendance/classes-manage.vue
+++ b/src/pages/attendance/classes-manage.vue
@@ -33,7 +33,6 @@
       scroll-y
       class="mt-2 flex-1 px-3 box-border"
       refresher-enabled
-      :refresher-threshold="45"
       @refresherrefresh="onRefresh()"
       :refresher-triggered="scrollViewStatus"
     >
@@ -88,10 +87,10 @@
   const key = ref('')
   const onRefresh = () => {
     console.log('refresh')
+    scrollViewStatus.value = true
     setTimeout(() => {
-      scrollViewStatus.value = true
       scrollViewStatus.value = false
-    }, 2000)
+    }, 500)
   }
   onLoad(options => {
     isSelect.value = options.isSelect ?? false

From 85aff7d423d85e71f2f834de53c3e1b8e2480715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B1=B3=E5=AD=90=E8=B1=AA?= <1012743329@qq.com>
Date: Fri, 10 Jan 2025 15:53:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=201.=E8=80=83=E5=8B=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance-device.vue                     | 78 ++++++++++++++-----
 src/pages/home/home.vue                       |  3 +-
 2 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/src/pages/attendance/attendance-add-group/attendance-device.vue b/src/pages/attendance/attendance-add-group/attendance-device.vue
index ac383b1..7f7491c 100644
--- a/src/pages/attendance/attendance-add-group/attendance-device.vue
+++ b/src/pages/attendance/attendance-add-group/attendance-device.vue
@@ -24,16 +24,17 @@
         <view
           @click="
             () => {
-              if (selectIndex == index) {
-                selectIndex = -1
+              device.isSelect = !device.isSelect
+              if (device.isSelect) {
+                selectList.push(device)
               } else {
-                selectIndex = index
+                selectList = selectList.filter(item => item.id !== device.id)
               }
             }
           "
           class="text-5"
           :class="
-            selectIndex == index
+            device.isSelect
               ? 'i-carbon-checkmark-filled color-[#3372FA]'
               : 'i-carbon-circle-outline color-gray'
           "
@@ -43,47 +44,82 @@
         <view class="ml-a color-gray">{{ device.type }}</view>
       </view>
     </scroll-view>
-    <view class="p-3 box-border border-solid border-0 border-t-1 border-gray-200 text-end">
-      <wd-button :round="false">确定</wd-button>
+    <view class="flex p-3 box-border border-solid border-0 border-t-1 border-gray-200 items-center">
+      <view
+        class="items-center flex flex-1"
+        :style="selectList.length != 0 ? '' : 'visibility: hidden;'"
+      >
+        <view class="color-[#3372FA]">已选中：{{ selectList.length }}个</view>
+        <view class="i-carbon-chevron-right color-[#3372FA] ml-2"></view>
+      </view>
+      <wd-button class="ml-a" :round="false">确定</wd-button>
     </view>
   </view>
 </template>
 
 <script lang="ts" setup>
   import { ref } from 'vue'
-  const selectIndex = ref(0)
+  const selectList = ref([])
   const deviceList = ref([
     {
       name: 'DK-K(L40231232)',
-      type: '公共门'
+      id: 0,
+      type: '公共门',
+      isSelect: false
     },
     {
       name: 'DK-K(L40231233)',
-      type: '私人门'
+      id: 1,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231234)',
+      id: 2,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231235)',
+      id: 3,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231236)',
+      id: 4,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231237)',
+      id: 5,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231238)',
+      id: 6,
+      type: '公共门',
+      isSelect: false
     },
     {
-      name: 'DK-K(L40231233)',
-      type: '私人门'
+      name: 'DK-K(L40231239)',
+      id: 7,
+      type: '公共门',
+      isSelect: false
+    },
+    {
+      name: 'DK-K(L40231240)',
+      id: 8,
+      type: '公共门',
+      isSelect: false
+    },
+    {
+      name: 'DK-K(L40231241)',
+      id: 9,
+      type: '公共门',
+      isSelect: false
     }
 
     // Add more devices as needed
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 0107281..98afa11 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -190,7 +190,8 @@
         {
           id: 382,
           icon: 'https://file.hikmall.com/prod/image/9e2b6e95c2904540a9a3dc675d25cc13.png',
-          name: '考勤设置'
+          name: '考勤设置',
+          url: '/pages/attendance/attendance'
         },
         {
           id: 383,