Skip to content

Commit 68ee3f5

Browse files
committed
admin/monthlyreport/detail - initial
1 parent 25a0075 commit 68ee3f5

File tree

4 files changed

+80
-67
lines changed

4 files changed

+80
-67
lines changed

src/router/AuthRoutes.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
const AuthRoutes = {
2-
path: '/auth',
3-
component: () => import('@/layouts/blank/BlankLayout.vue'),
4-
meta: {
5-
requiresAuth: false
6-
},
7-
children: [
8-
{
9-
name: 'Login',
10-
path: '/auth/login',
11-
component: () => import('@/views/authentication/auth/LoginPage.vue')
2+
path: '/auth',
3+
component: () => import('@/layouts/blank/BlankLayout.vue'),
4+
meta: {
5+
requiresAuth: false
126
},
13-
{
14-
name: 'Register',
15-
path: '/auth/register',
16-
component: () => import('@/views/authentication/auth/RegisterPage.vue')
17-
},
18-
{
19-
name: 'Error 404',
20-
path: '/pages/error',
21-
component: () => import('@/views/pages/maintenance/error/Error404Page.vue')
22-
}
23-
]
7+
children: [
8+
{
9+
name: 'Login',
10+
path: '/auth/login',
11+
component: () => import('@/views/authentication/auth/LoginPage.vue')
12+
},
13+
{
14+
name: 'Register',
15+
path: '/auth/register',
16+
component: () => import('@/views/authentication/auth/RegisterPage.vue')
17+
},
18+
{
19+
name: 'Error 404',
20+
path: '/pages/error',
21+
component: () => import('@/views/pages/maintenance/error/Error404Page.vue')
22+
}
23+
]
2424
};
2525

2626
export default AuthRoutes;

src/router/UserRoutes.ts

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
const UserRoutes = {
2-
path: '/user',
3-
meta: {
4-
requiresAuth: true
5-
},
6-
redirect: '/user/home',
7-
component: () => import('@/layouts/user/UserLayout.vue'),
8-
children: [
9-
{
10-
name: 'Home',
11-
path: 'home',
12-
component: () => import('@/views/user/home/UserHome.vue')
2+
path: '/user',
3+
meta: {
4+
requiresAuth: true
135
},
14-
{
15-
name: 'WorkSchedule',
16-
path: 'workschedule',
17-
component: () => import('@/views/user/workschedule/WorkSchedule.vue')
18-
},
19-
{
20-
name: 'MonthlyReport',
21-
path: 'monthlyreport',
22-
component: () => import('@/views/user/monthlyreport/MonthlyReportDetail.vue')
23-
},
24-
{
25-
name: 'AttendanceList',
26-
path: 'attendancelist',
27-
component: () => import('@/views/user/attendancelist/AttendanceList.vue')
28-
},
29-
{
30-
name: 'WeeklyReport',
31-
path: 'weeklyreport',
32-
component: () => import('@/views/user/weeklyreport/WeeklyReport.vue')
33-
},
34-
{
35-
name: 'PersonalSetting',
36-
path: 'personalsetting',
37-
component: () => import('@/views/user/personalsetting/PersonalSetting.vue')
38-
}
39-
]
6+
redirect: '/user/home',
7+
component: () => import('@/layouts/user/UserLayout.vue'),
8+
children: [
9+
{
10+
name: 'Home',
11+
path: 'home',
12+
component: () => import('@/views/user/home/UserHome.vue')
13+
},
14+
{
15+
name: 'WorkSchedule',
16+
path: 'workschedule',
17+
component: () => import('@/views/user/workschedule/WorkSchedule.vue')
18+
},
19+
{
20+
name: 'MonthlyReport',
21+
path: 'monthlyreport',
22+
component: () => import('@/views/user/monthlyreport/MonthlyReportDetail.vue')
23+
},
24+
{
25+
name: 'AttendanceList',
26+
path: 'attendancelist',
27+
component: () => import('@/views/user/attendancelist/AttendanceList.vue')
28+
},
29+
{
30+
name: 'WeeklyReport',
31+
path: 'weeklyreport',
32+
component: () => import('@/views/user/weeklyreport/WeeklyReport.vue')
33+
},
34+
{
35+
name: 'PersonalSetting',
36+
path: 'personalsetting',
37+
component: () => import('@/views/user/personalsetting/PersonalSetting.vue')
38+
}
39+
]
4040
};
4141

4242
export default UserRoutes;

src/scss/components/_VInput.scss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,60 @@
33
.v-field--variant-filled {
44
--v-input-control-height: 39px;
55
--v-input-padding-top: 2px;
6+
67
input.v-field__input {
78
padding-bottom: 2px;
89
}
10+
911
.v-field__input {
1012
padding-bottom: 2px;
1113
}
14+
1215
textarea {
1316
padding-top: 11px;
1417
}
1518
}
19+
1620
.v-input--density-default {
1721
.v-field__input {
1822
min-height: 41px;
1923
}
2024
}
25+
2126
.v-field--variant-outlined {
2227
&.v-field--focused {
2328
.v-field__outline {
2429
--v-field-border-width: 1px;
2530
}
2631
}
2732
}
33+
2834
.remove-details {
2935
.v-input__details {
3036
display: none;
3137
}
3238
}
39+
3340
.v-input {
3441
.v-input__details {
3542
padding-inline: 0;
3643
}
44+
45+
.v-field__input {
46+
color: rgb(var(--v-theme-darkText))
47+
}
3748
}
3849

3950
.v-input--density-comfortable {
4051
--v-input-control-height: 56px;
4152
--v-input-padding-top: 17px;
4253
}
54+
4355
.v-label {
4456
font-size: 0.875rem;
4557
--v-medium-emphasis-opacity: 0.8;
4658
}
59+
4760
.v-switch .v-label,
4861
.v-checkbox .v-label {
4962
opacity: 1;
@@ -57,4 +70,4 @@ textarea.v-field__input {
5770
.v-label {
5871
top: 15px;
5972
}
60-
}
73+
}

src/views/admin/monthlyreport/MonthlyReportDetail.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ const panel = [0, 1, 2, 3, 4, 5];
1616
<div class="pa-2 float-left" style="border: 1px solid rgb(var(--v-theme-inputBorder)); display: inline; border-radius: 5px">
1717
{{ nowYear }}年 {{ formattedMonth }}月 <span class="pl-5"><v-icon icon="mdi-calendar-blank"></v-icon></span>
1818
</div>
19-
<div class="float-right d-flex align-center">
19+
<!-- <div class="float-right d-flex align-center">
2020
<v-icon icon="mdi-account" color="lightsecondary" size="large"></v-icon>
2121
<div class="text-decoration-underline ml-2 text-h4 font-weight-medium" :style="{ color: 'rgb(var(--v-theme-primary))' }">
2222
名字名前
2323
</div>
24-
</div>
24+
</div> -->
2525
</v-col>
2626
<v-col cols="12">
2727
<div class="float-left">
@@ -62,12 +62,12 @@ const panel = [0, 1, 2, 3, 4, 5];
6262
</v-col>
6363
<v-divider thickness="2" :style="{ 'border-color': 'rgb(var(--v-theme-textmain))' }"></v-divider>
6464
<v-expansion-panels v-model="panel" flat multiple>
65-
<ScheduledTime />
66-
<OfficeWorkSchedule />
67-
<WorkScheduleTime />
68-
<VacationDeductionHoliday />
69-
<SubScription />
70-
<TrafficReport />
65+
<!-- <ScheduledTime /> -->
66+
<!-- <OfficeWorkSchedule /> -->
67+
<!-- <WorkScheduleTime /> -->
68+
<!-- <VacationDeductionHoliday /> -->
69+
<!-- <SubScription /> -->
70+
<!-- <TrafficReport /> -->
7171
</v-expansion-panels>
7272
<v-col cols="12" class="pa-0">
7373
<div class="py-2"></div>

0 commit comments

Comments
 (0)