From 5265a7c1c6653e29fa8fd816de038e627611c82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B1=B3=E5=AD=90=E8=B1=AA?= <1012743329@qq.com> Date: Mon, 6 Jan 2025 17:21:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=E7=8F=AD=E6=AC=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=202.=E6=96=B0=E5=A2=9E=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 20 ++- src/components/CommonItemItem/CommonItem.vue | 7 +- src/pages/attendance/AttendanceSet.vue | 13 +- .../attendance-add-group.vue | 47 ++++--- .../attendance-add-group/attendance-staff.vue | 28 ++++ .../attendance-add-group/outside-rules.vue | 27 ++-- src/pages/attendance/attendance.vue | 1 + src/pages/attendance/classes-add.vue | 97 +++++++++++++ src/pages/attendance/classes-manage.vue | 128 ++++++++++++++++++ src/pages/attendance/flexible-punching.vue | 21 +++ src/pages/notification/notification.vue | 11 +- 12 files changed, 363 insertions(+), 38 deletions(-) create mode 100644 src/pages/attendance/attendance-add-group/attendance-staff.vue create mode 100644 src/pages/attendance/classes-add.vue create mode 100644 src/pages/attendance/classes-manage.vue create mode 100644 src/pages/attendance/flexible-punching.vue diff --git a/package.json b/package.json index 40ca9c7..3ecefa2 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,7 @@ "@dcloudio/vite-plugin-uni": "3.0.0-4020920240930001", "@esbuild/darwin-arm64": "0.20.2", "@esbuild/darwin-x64": "0.20.2", + "@iconify-json/bytesize": "^1.2.2", "@iconify-json/carbon": "^1.2.4", "@rollup/rollup-darwin-x64": "^4.28.0", "@types/node": "^20.17.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a33933e..d31508e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ importers: specifier: 3.4.21 version: 3.4.21(typescript@5.7.2) wot-design-uni: - specifier: 1.5.1 - version: 1.5.1(vue@3.4.21(typescript@5.7.2)) + specifier: 1.4.0 + version: 1.4.0(vue@3.4.21(typescript@5.7.2)) z-paging: specifier: ^2.8.4 version: 2.8.4 @@ -105,6 +105,9 @@ importers: '@esbuild/darwin-x64': specifier: 0.20.2 version: 0.20.2 + '@iconify-json/bytesize': + specifier: ^1.2.2 + version: 1.2.2 '@iconify-json/carbon': specifier: ^1.2.4 version: 1.2.4 @@ -1223,6 +1226,9 @@ packages: resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} deprecated: Use @eslint/object-schema instead + '@iconify-json/bytesize@1.2.2': + resolution: {integrity: sha512-lI/wtPosh84caAS+UcudpeKiQk9ShfVoeaUTtzgOOBUhwQvjDuSiiHqe84v5NluHuIIFW64Fa3kuoGoluxWgpA==} + '@iconify-json/carbon@1.2.4': resolution: {integrity: sha512-DhW2jjMVGwV0DLHc0cmDYohdtGxMra8UuwgjHrryPy+rQX4gXhJwCBBVP2h2UG/92AoRCTn7zUJve4WvY5MLYg==} @@ -5456,8 +5462,8 @@ packages: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} - wot-design-uni@1.5.1: - resolution: {integrity: sha512-jiDRuF8r7+xAldc4Dp+2T1VnqDnOoMWsXu6aRpDg2QG7ZH+/bJl7W8H8hHbKFgA9lu1By/HCDmpG7JC45nYtBw==} + wot-design-uni@1.4.0: + resolution: {integrity: sha512-h6sjrgfg7mP0nJwGTiHn/iTLPFyRswMpQV6MKhWN3skTnXe+FAyndvtXofpXp+uLkTXefGfw5BPI0uuCMD874w==} engines: {HBuilderX: ^3.8.7} peerDependencies: vue: '>=3.2.47' @@ -7190,6 +7196,10 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} + '@iconify-json/bytesize@1.2.2': + dependencies: + '@iconify/types': 2.0.0 + '@iconify-json/carbon@1.2.4': dependencies: '@iconify/types': 2.0.0 @@ -12236,7 +12246,7 @@ snapshots: word-wrap@1.2.5: {} - wot-design-uni@1.5.1(vue@3.4.21(typescript@5.7.2)): + wot-design-uni@1.4.0(vue@3.4.21(typescript@5.7.2)): dependencies: vue: 3.4.21(typescript@5.7.2) diff --git a/src/components/CommonItemItem/CommonItem.vue b/src/components/CommonItemItem/CommonItem.vue index 7f4bad4..05a3714 100644 --- a/src/components/CommonItemItem/CommonItem.vue +++ b/src/components/CommonItemItem/CommonItem.vue @@ -1,8 +1,11 @@ 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 30da208..78d0f4e 100644 --- a/src/pages/attendance/attendance-add-group/attendance-add-group.vue +++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue @@ -8,7 +8,6 @@ diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue index 755a32c..29a94fe 100644 --- a/src/pages/attendance/attendance.vue +++ b/src/pages/attendance/attendance.vue @@ -21,6 +21,7 @@ import AttendanceClockIn from './AttendanceClockIn.vue' import AttendanceStatistics from './AttendanceStatistics.vue' import AttendanceSet from './AttendanceSet.vue' + import { TabBarItem } from '@/typings' const pages = [AttendanceClockIn, AttendanceStatistics, AttendanceSet] const titleTab = ['考勤打卡', '考勤统计', '设置'] const list = ref>([ diff --git a/src/pages/attendance/classes-add.vue b/src/pages/attendance/classes-add.vue new file mode 100644 index 0000000..346f023 --- /dev/null +++ b/src/pages/attendance/classes-add.vue @@ -0,0 +1,97 @@ + +{ + layout: 'default', + style: { + navigationStyle: 'custom' + } +} + + + + + + + diff --git a/src/pages/attendance/classes-manage.vue b/src/pages/attendance/classes-manage.vue new file mode 100644 index 0000000..5840f78 --- /dev/null +++ b/src/pages/attendance/classes-manage.vue @@ -0,0 +1,128 @@ + +{ + layout: 'default', + style: { + navigationStyle: 'custom' + } +} + + + + + + + diff --git a/src/pages/attendance/flexible-punching.vue b/src/pages/attendance/flexible-punching.vue new file mode 100644 index 0000000..b6e1037 --- /dev/null +++ b/src/pages/attendance/flexible-punching.vue @@ -0,0 +1,21 @@ + +{ + layout: 'default', + style: { + navigationStyle: 'custom' + } +} + + + + + + + diff --git a/src/pages/notification/notification.vue b/src/pages/notification/notification.vue index 126a836..0a03307 100644 --- a/src/pages/notification/notification.vue +++ b/src/pages/notification/notification.vue @@ -1,7 +1,14 @@ - +