From 3990d11f0dca5429d07f091d9243ad1247dcccce Mon Sep 17 00:00:00 2001 From: hdm Date: Tue, 30 Nov 2021 18:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=97=A5=E7=A8=8B=E5=AE=89?= =?UTF-8?q?=E6=8E=92=EF=BC=8C=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=8E=A7=E4=BB=B6=E5=88=B0=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E6=96=B0=E7=89=88=EF=BC=8C=E5=8A=9F=E8=83=BD=E6=9B=B4=E5=BC=BA?= =?UTF-8?q?=E5=A4=A7=EF=BC=8C=E4=BD=93=E9=AA=8C=E6=9B=B4=E8=88=92=E9=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/home/controller/Schedule.php | 4 ++-- app/home/view/plan/calendar.html | 22 ++++++++++++++++++---- app/home/view/schedule/calendar.html | 21 ++++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/app/home/controller/Schedule.php b/app/home/controller/Schedule.php index 4072169..df10c06 100644 --- a/app/home/controller/Schedule.php +++ b/app/home/controller/Schedule.php @@ -159,8 +159,8 @@ class Schedule extends BaseController $events[] = $v; } foreach ($countEvents as $kk => $vv) { - $vv['backgroundColor'] = '#FF5722'; - $vv['borderColor'] = '#FF5722'; + $vv['backgroundColor'] = '#eeeeee'; + $vv['borderColor'] = '#eeeeee'; $vv['title'] = '【当天总工时：' . $vv['times'] . '】'; $vv['end'] = $vv['start']; $vv['id'] = 0; diff --git a/app/home/view/plan/calendar.html b/app/home/view/plan/calendar.html index d265334..3d7371c 100644 --- a/app/home/view/plan/calendar.html +++ b/app/home/view/plan/calendar.html @@ -27,11 +27,25 @@ user-select: none;} } .fc .fc-button-primary:hover{color:#fff; background-color:#52B5FF; border-color:#52B5FF;} .fc-daygrid-event-harness{cursor:pointer;} +.fc .fc-daygrid-week-number{background-color: #F3FFDF; font-size:12px;} +/*今天背景色和字体颜色chocolate */ +.fc .fc-daygrid-day.fc-day-today .fc-event-title,.fc .fc-daygrid-day.fc-day-today .fc-event-time,.fc .fc-daygrid-day.fc-day-today .fc-daygrid-day-number{ + font-weight:800; + color:#FF5722; +} +/*星期六背景色和字体颜色 */ +.fc-day-sat{ + background-color: #F3FFDF; +} +/*星期天背景色和字体颜色 */ +.fc-day-sun{ + background-color: #F3FFDF; +} -.layui-tags-span {padding: 3px 6px;font-size: 12px; background-color:#fff; border-radius: 3px; margin:2px 0; margin-right: 5px; border: 1px solid #e6e6e6; display: inline-block;} -.layui-layer-content .layui-table-view .layui-table td,.layui-layer-content .layui-table-view .layui-table th{padding:1px 0;} .calendar-select{width:100px; height:38px; position:absolute; top:31px; right:255px; z-index:100;} .calendar-select .layui-input{height: 36px; line-height: 1.2;} +.layui-tags-span {padding: 3px 6px;font-size: 12px; background-color:#fff; border-radius: 3px; margin:2px 0; margin-right: 5px; border: 1px solid #e6e6e6; display: inline-block;} +.layui-layer-content .layui-table-view .layui-table td,.layui-layer-content .layui-table-view .layui-table th{padding:1px 0;} .layui-unselect dl {max-height:188px;} {/block} @@ -150,7 +164,7 @@ user-select: none;} '; layer.open({ type:1, - title:'日程安排', + title:'创建日程安排', area:['860px','390px'], content:content, success:function(){ @@ -346,7 +360,7 @@ user-select: none;} '; layer.open({ type:1, - title:'日程安排', + title:'查看日程安排', area:['800px','336px'], content:content, success:function(){ diff --git a/app/home/view/schedule/calendar.html b/app/home/view/schedule/calendar.html index a11bd07..9397aa3 100644 --- a/app/home/view/schedule/calendar.html +++ b/app/home/view/schedule/calendar.html @@ -27,11 +27,26 @@ user-select: none;} } .fc .fc-button-primary:hover{color:#fff; background-color:#52B5FF; border-color:#52B5FF;} .fc-daygrid-event-harness{cursor:pointer;} +.fc .fc-daygrid-week-number{background-color: #F3FFDF; font-size:12px;} +/*今天背景色和字体颜色chocolate */ +.fc .fc-daygrid-day.fc-day-today .fc-event-title,.fc .fc-daygrid-day.fc-day-today .fc-event-time,.fc .fc-daygrid-day.fc-day-today .fc-daygrid-day-number{ + font-weight:800; + color:#FF5722; +} +/*星期六背景色和字体颜色 */ +.fc-day-sat{ + background-color: #F3FFDF; +} +/*星期天背景色和字体颜色 */ +.fc-day-sun{ + background-color: #F3FFDF; +} +.fc-h-event .fc-event-main{color:#333} -.layui-tags-span {padding: 3px 6px;font-size: 12px; background-color:#fff; border-radius: 3px; margin:2px 0; margin-right: 5px; border: 1px solid #e6e6e6; display: inline-block;} -.layui-layer-content .layui-table-view .layui-table td,.layui-layer-content .layui-table-view .layui-table th{padding:1px 0;} .calendar-select{width:100px; height:38px; position:absolute; top:31px; right:255px; z-index:100;} .calendar-select .layui-input{height: 36px; line-height: 1.2;} +.layui-tags-span {padding: 3px 6px;font-size: 12px; background-color:#fff; border-radius: 3px; margin:2px 0; margin-right: 5px; border: 1px solid #e6e6e6; display: inline-block;} +.layui-layer-content .layui-table-view .layui-table td,.layui-layer-content .layui-table-view .layui-table th{padding:1px 0;} .layui-unselect dl {max-height:188px;} {/block} @@ -262,7 +277,7 @@ user-select: none;} '; layer.open({ type:1, - title:'工作记录', + title:'查看工作记录', area:['800px','336px'], content:content, success:function(){