From 484d58350bb274e6e65ee7ab2a7552564a037fcc Mon Sep 17 00:00:00 2001 From: hdm Date: Tue, 30 Nov 2021 14:06:28 +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/Plan.php | 41 +- app/home/view/plan/calendar.html | 259 +- app/home/view/schedule/calendar.html | 182 +- .../static/fullcalendar/core/locales-all.js | 1353 --- .../fullcalendar/core/locales-all.min.js | 6 - .../static/fullcalendar/core/locales/en-au.js | 17 - .../static/fullcalendar/core/locales/en-gb.js | 17 - .../static/fullcalendar/core/locales/en-nz.js | 17 - .../static/fullcalendar/core/locales/zh-cn.js | 33 - .../static/fullcalendar/core/locales/zh-tw.js | 26 - public/static/fullcalendar/core/main.css | 871 -- public/static/fullcalendar/core/main.js | 8546 ----------------- public/static/fullcalendar/core/main.min.css | 5 - public/static/fullcalendar/core/main.min.js | 9 - public/static/fullcalendar/daygrid/main.css | 69 - public/static/fullcalendar/daygrid/main.js | 1630 ---- .../static/fullcalendar/daygrid/main.min.css | 5 - .../static/fullcalendar/daygrid/main.min.js | 20 - .../static/fullcalendar/interaction/main.js | 2155 ----- .../fullcalendar/interaction/main.min.js | 21 - public/static/fullcalendar/list/main.css | 101 - public/static/fullcalendar/list/main.js | 341 - public/static/fullcalendar/list/main.min.css | 5 - public/static/fullcalendar/list/main.min.js | 20 - public/static/fullcalendar/main.min.css | 1 + public/static/fullcalendar/main.min.js | 6 + public/static/fullcalendar/timegrid/main.css | 266 - public/static/fullcalendar/timegrid/main.js | 1339 --- .../static/fullcalendar/timegrid/main.min.css | 5 - .../static/fullcalendar/timegrid/main.min.js | 20 - public/static/home/css/gougucms.css | 18 +- 31 files changed, 330 insertions(+), 17074 deletions(-) delete mode 100644 public/static/fullcalendar/core/locales-all.js delete mode 100644 public/static/fullcalendar/core/locales-all.min.js delete mode 100644 public/static/fullcalendar/core/locales/en-au.js delete mode 100644 public/static/fullcalendar/core/locales/en-gb.js delete mode 100644 public/static/fullcalendar/core/locales/en-nz.js delete mode 100644 public/static/fullcalendar/core/locales/zh-cn.js delete mode 100644 public/static/fullcalendar/core/locales/zh-tw.js delete mode 100644 public/static/fullcalendar/core/main.css delete mode 100644 public/static/fullcalendar/core/main.js delete mode 100644 public/static/fullcalendar/core/main.min.css delete mode 100644 public/static/fullcalendar/core/main.min.js delete mode 100644 public/static/fullcalendar/daygrid/main.css delete mode 100644 public/static/fullcalendar/daygrid/main.js delete mode 100644 public/static/fullcalendar/daygrid/main.min.css delete mode 100644 public/static/fullcalendar/daygrid/main.min.js delete mode 100644 public/static/fullcalendar/interaction/main.js delete mode 100644 public/static/fullcalendar/interaction/main.min.js delete mode 100644 public/static/fullcalendar/list/main.css delete mode 100644 public/static/fullcalendar/list/main.js delete mode 100644 public/static/fullcalendar/list/main.min.css delete mode 100644 public/static/fullcalendar/list/main.min.js create mode 100644 public/static/fullcalendar/main.min.css create mode 100644 public/static/fullcalendar/main.min.js delete mode 100644 public/static/fullcalendar/timegrid/main.css delete mode 100644 public/static/fullcalendar/timegrid/main.js delete mode 100644 public/static/fullcalendar/timegrid/main.min.css delete mode 100644 public/static/fullcalendar/timegrid/main.min.js diff --git a/app/home/controller/Plan.php b/app/home/controller/Plan.php index ab53f93..06779b6 100644 --- a/app/home/controller/Plan.php +++ b/app/home/controller/Plan.php @@ -82,7 +82,7 @@ class Plan extends BaseController ->whereOr(function ($query) use ($where2) { $query->where($where2); }) - ->field('id,title,type,start_time,end_time') + ->field('id,title,type,remind_type,start_time,end_time') ->select()->toArray(); $events = []; $color_array=['#393D49','#FF5722','#FFB800','#1E9FFF','#12bb37']; @@ -134,25 +134,26 @@ class Plan extends BaseController if ($param['end_time'] <= $param['start_time']) { return to_assign(1, "结束时间需要大于开始时间"); } - - if($param['remind_type']==1){ - $param['remind_time'] = $param['start_time']-5*60; - } - if($param['remind_type']==2){ - $param['remind_time'] = $param['start_time']-15*60; - } - if($param['remind_type']==3){ - $param['remind_time'] = $param['start_time']-30*60; - } - if($param['remind_type']==4){ - $param['remind_time'] = $param['start_time']-60*60; - } - if($param['remind_type']==5){ - $param['remind_time'] = $param['start_time']-120*60; - } - if($param['remind_type']==6){ - $param['remind_time'] = $param['start_time']-1440*60; - } + if (isset($param['remind_type'])) { + if($param['remind_type']==1){ + $param['remind_time'] = $param['start_time']-5*60; + } + if($param['remind_type']==2){ + $param['remind_time'] = $param['start_time']-15*60; + } + if($param['remind_type']==3){ + $param['remind_time'] = $param['start_time']-30*60; + } + if($param['remind_type']==4){ + $param['remind_time'] = $param['start_time']-60*60; + } + if($param['remind_type']==5){ + $param['remind_time'] = $param['start_time']-120*60; + } + if($param['remind_type']==6){ + $param['remind_time'] = $param['start_time']-1440*60; + } + } if ($param['id'] == 0) { $param['admin_id'] = $admin_id; $param['did'] = get_admin($admin_id)['did']; diff --git a/app/home/view/plan/calendar.html b/app/home/view/plan/calendar.html index 68d2c66..5111c5f 100644 --- a/app/home/view/plan/calendar.html +++ b/app/home/view/plan/calendar.html @@ -1,38 +1,47 @@ {extend name="common/base"/} {block name="style"} - - - - + {/block} {block name="body"} - - - - - - +
-
- -
-
- +
@@ -41,7 +50,12 @@ {block name="script"} - - - - - +
-
- -
-
- +
@@ -40,8 +49,13 @@ {block name="script"}