From 5932d556bccf9ffde28fcfc5319ab4cacad79781 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Thu, 10 Dec 2020 16:18:56 +0800 Subject: [PATCH] update --- assets/css/ace.min.css | 42 ++++++++++++++++++---- assets/css/fullcalendar.css | 8 ++--- assets/images/tongji.png | Bin 4158 -> 353 bytes pmcalendar.php | 70 ++++++++++++++++++++++++++++-------- 4 files changed, 96 insertions(+), 24 deletions(-) diff --git a/assets/css/ace.min.css b/assets/css/ace.min.css index 85fb410..4cbc077 100644 --- a/assets/css/ace.min.css +++ b/assets/css/ace.min.css @@ -50,7 +50,7 @@ body.breadcrumbs-fixed { margin-top: 0; min-height: 100%; padding: 0; - background-color: #f5f5f9; + background-color:#f3f3f3; } .page-content { background: #fff; @@ -10986,7 +10986,7 @@ ul.attachment-list > li { color: #838383; } .fc-widget-header { - background: #fff; + background: #f7f7f7; color: #6b6b6b; } .fc-event-hori, @@ -14899,20 +14899,25 @@ th[aria-selected='true'] .ui-jqgrid-sortable { @media only screen and (max-width:480px) { .datarepair { - top: 84px !important; + top: 150px !important; } .data_tab { width: 100% !important; - top: 106px !important; + top: 70px !important; right: 0% !important; + left: 0 !important; + margin: auto; + flex-flow:initial !important; + float: none !important; } + .data-name {display: none;} .fc-content { /* top: 80px !important; */ margin-top: 60px; } .fc-header-right { width: auto !important; - top: 64px !important; + top: 40px !important; left: 0px !important; right: 0px !important; margin: 0 auto; @@ -14928,6 +14933,31 @@ th[aria-selected='true'] .ui-jqgrid-sortable { #chart { margin-top: 190px !important; } + + + .label-success, + .badge-success { + background-image: none; + } + .label-danger, + .badge-danger { + background-image: none; + } + .label-warning, + .badge-warning { + background-image: none; + } + + .label-pink, + .badge-pink { + background-image: none; + } + .label-purple, + .badge-purple { + background-image: none; + } + + } @media only screen and (max-width:1100px) { @@ -14953,7 +14983,7 @@ th[aria-selected='true'] .ui-jqgrid-sortable { width: 100px !important; } .datarepair { - top: 160px !important; + top: 150px !important; } } diff --git a/assets/css/fullcalendar.css b/assets/css/fullcalendar.css index 22950ae..59e4228 100644 --- a/assets/css/fullcalendar.css +++ b/assets/css/fullcalendar.css @@ -136,18 +136,18 @@ html .fc, .fc-widget-header, /* , usually */ .fc-widget-content { /* , usually */ - border: 1px solid #f3f3f3; + border: 1px solid #e8e8e8; } .fc-state-highlight { /* today cell */ /* TODO: add .fc-today to */ - background: #f5f5f9; + background: #dfe3f3; /* background-image: url('http://10.0.0.5/leguevent_dev//assets/images/dian.png'); background-repeat: no-repeat; background-position: right 3.5px top 7.5px; */ } .fc-cell-overlay { /* semi-transparent rectangle while dragging */ - background:#f5f5f9; + background:#e2e2e2; opacity: .3; filter: alpha(opacity=30); /* for IE */ } @@ -294,7 +294,7 @@ html .fc, font-size: .85em; cursor: default; border-radius: 0px !important; - padding: 10px 5px 10px 15px; + padding: 10px 2px 10px 2px; margin: 10px 12px 0px 12px; cursor:pointer; /* font-weight: bold; */ diff --git a/assets/images/tongji.png b/assets/images/tongji.png index cc2a5792c53523a4880eaee21ba6b7ab1d4e6969..f366b3fadda4e9628fbdec5dfdc4583f5311e949 100644 GIT binary patch literal 353 zcmV-n0iOPeP)|5;tjsycnBCUjy2q? zIgX6B#@m|X-bL~ul_}hZ0pTR1GLO&a;ODT5>t_i!@CCQpdlDn~Rdd{LweNk8{S0$B z!V}b*jMW^w zE%bg!WqI(!zoDSZ_*rx8Le232fADBP=nfHHV!9~{sVwO4<9X2O{l!)MZr~p^$Ayr} zdpvH#m}tFcqqvJzjJ4unv#}Ub`GgsKX!quSCh%I*2GtpU00000NkvXXu0mjfKBB0f literal 4158 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 W414j)`n$HxKYCl71Gd7_H}RiqAu{{` diff --git a/pmcalendar.php b/pmcalendar.php index c27f086..9ee6fc2 100644 --- a/pmcalendar.php +++ b/pmcalendar.php @@ -334,15 +334,16 @@ if ($act == 'newevent') { line-height: 27px; position: relative; top: 60px; - color: #9f9f9f; + color: #0078f7; margin: 0 auto; cursor: pointer; font-size: 12px; display: flex; - background-color:#f3f3f3; + background-color:#ffffff; border-radius: 8px; text-align: center; margin-bottom: 15px; + border: 1px solid #0078f7; } .datarepair img { @@ -400,7 +401,7 @@ if ($act == 'newevent') { .xian3 { height: 13px; width:100%; - background-color:#f5f5f9; + background-color:#f3f3f3; } @@ -466,6 +467,9 @@ if ($act == 'newevent') { border: 0px !important; text-align: center; } + .fc-week { + background-color:#f7f7f7; + }
查看统计 @@ -778,7 +782,7 @@ if ($act == 'newevent') {
- +
@@ -1341,8 +1345,12 @@ if ($act == 'newevent') { $('#uploader_yy').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yunyig&act=add') $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add') - $("#listcp").show(); - $("#listyf").show(); + $("#listcp").hide(); + $("#listyf").hide(); + + $("#yytext").attr('placeholder','填写本次更新概要，详细更新内容请使用附件') + + //console.log($('#uploader').attr('action')) dict = {}; @@ -1391,6 +1399,37 @@ if ($act == 'newevent') { showEventData(calEvent.id); } ; + } else if(calEvent.className[0] == 'label-warning'){ + + if ("" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1") { + return + } else { + $('#uploader').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=chanpin&act=add'); + $('#uploader_yy').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yunyig&act=add') + $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add') + + $("#listcp").show(); + $("#listyf").show(); + //console.log($('#uploader').attr('action')) + + dict = {}; + $.post('./?app=pmcalendar&act=getEventByid', {id: calEvent.id}, function (txt) { + var j = JSON.parse(txt); + dict.start = j.start; + dict.end = j.end; + dict.id = calEvent.id; + $('#game').val(j.game); + $('#hour').val(j.shour); + $('#min').val(j.smin); + $('#event').val(j.event); + $('#title').val(j.title); + hourChange($('#hour')); + }); + dstr = $.fullCalendar.formatDate(calEvent.start, 'yyyy-MM-dd'); + showEventData(calEvent.id); + } + ; + } else { if ("" == "1") { dict = {}; @@ -1646,16 +1685,19 @@ if ($act == 'newevent') { } // if(res.fujian != null){ - var fujian = JSON.parse(res.fujian); - for (let i in fujian) { - if (fujian[i]['bumen'] == 'chanpin') { - arrcp.push(fujian[i]) - } else if (fujian[i]['bumen'] == 'yunyig') { - arryy.push(fujian[i]) - } else if (fujian[i]['bumen'] == 'yanfa') { - arryf.push(fujian[i]) + if(res.fujian != ""){ + var fujian = JSON.parse(res.fujian); + for (let i in fujian) { + if (fujian[i]['bumen'] == 'chanpin') { + arrcp.push(fujian[i]) + } else if (fujian[i]['bumen'] == 'yunyig') { + arryy.push(fujian[i]) + } else if (fujian[i]['bumen'] == 'yanfa') { + arryf.push(fujian[i]) + } } } + if(arrcp.length != 0){ tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法