diff --git a/ui/src/components/home/AttendanceCard.vue b/ui/src/components/home/AttendanceCard.vue new file mode 100644 index 0000000..6312344 --- /dev/null +++ b/ui/src/components/home/AttendanceCard.vue @@ -0,0 +1,61 @@ + + + + diff --git a/ui/src/components/home/NoticeCard.vue b/ui/src/components/home/NoticeCard.vue index d635dfe..a9142dc 100644 --- a/ui/src/components/home/NoticeCard.vue +++ b/ui/src/components/home/NoticeCard.vue @@ -3,7 +3,7 @@
diff --git a/ui/src/components/home/WorkCard.vue b/ui/src/components/home/WorkCard.vue index 26fec86..22b5df9 100644 --- a/ui/src/components/home/WorkCard.vue +++ b/ui/src/components/home/WorkCard.vue @@ -3,7 +3,7 @@
diff --git a/ui/src/pages/home/Home.vue b/ui/src/pages/home/Home.vue index 0b7ea12..507fd83 100644 --- a/ui/src/pages/home/Home.vue +++ b/ui/src/pages/home/Home.vue @@ -5,16 +5,14 @@ - + - - - +
@@ -24,10 +22,11 @@ import request from '@/services' import AffairsCard from '@/components/home/AffairsCard.vue' import { DATABASE_SELECT_OK } from '@/constants/Common.constants' import { ElMessage } from 'element-plus' +import AttendenceCard from '@/components/home/AttendanceCard.vue' export default { name: 'HomePage', - components: { AffairsCard }, + components: { AttendenceCard, AffairsCard }, data() { return { works: [], diff --git a/ui/src/pages/profile/PersonalProfile.vue b/ui/src/pages/profile/PersonalProfile.vue index 832b079..a66974e 100644 --- a/ui/src/pages/profile/PersonalProfile.vue +++ b/ui/src/pages/profile/PersonalProfile.vue @@ -52,6 +52,7 @@ v-model="form.birth" size="default" placeholder="请选择日期" + value-format="YYYY-MM-DD" /> @@ -239,7 +240,7 @@ export default { this.visible = false }, checkEmail(rule, value, callback) { - const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/ + const mailReg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/ if (mailReg.test(value)) { callback() } else { diff --git a/ui/src/router/index.ts b/ui/src/router/index.ts index b2f2a41..10bf3f1 100644 --- a/ui/src/router/index.ts +++ b/ui/src/router/index.ts @@ -36,7 +36,10 @@ const router = createRouter({ { path: '/profile', component: async () => await import('@/pages/profile/PersonalProfile.vue'), - name: 'profile' + name: 'profile', + meta: { + title: '个人档案' + } }, workRouter, noticeRouter,