diff --git a/assets/css/fullcalendar.css b/assets/css/fullcalendar.css index bc6787f..7c85e50 100644 --- a/assets/css/fullcalendar.css +++ b/assets/css/fullcalendar.css @@ -61,6 +61,7 @@ html .fc, text-align: left; position: absolute; left: 11px; + top: 32px; z-index: 100000; } @@ -81,7 +82,8 @@ html .fc, .fc-header .fc-button { margin-bottom: 1em; - vertical-align: top; + vertical-align: top; + font-size: 12px; } /* buttons edges butting together */ @@ -138,7 +140,10 @@ html .fc, } .fc-state-highlight { /* today cell */ /* TODO: add .fc-today to */ - background: #e6e6e6; + background: #fff; + background-image: url('/assets/images/dian.png'); + background-repeat: no-repeat; + background-position: right 3.5px top 7.5px; } .fc-cell-overlay { /* semi-transparent rectangle while dragging */ @@ -450,7 +455,8 @@ table.fc-border-separate { .fc-grid .fc-day-number { text-align: right; - padding: 10px; + padding: 10px; + font-size: 12px; } .fc-grid .fc-other-month .fc-day-number { diff --git a/assets/images/dian.png b/assets/images/dian.png new file mode 100644 index 0000000..d324935 Binary files /dev/null and b/assets/images/dian.png differ diff --git a/assets/images/jia.png b/assets/images/jia.png new file mode 100644 index 0000000..c73f147 Binary files /dev/null and b/assets/images/jia.png differ diff --git a/assets/images/x.png b/assets/images/x.png new file mode 100644 index 0000000..58ee400 Binary files /dev/null and b/assets/images/x.png differ diff --git a/pmcalendar.php b/pmcalendar.php index 7966700..e6a0a95 100644 --- a/pmcalendar.php +++ b/pmcalendar.php @@ -333,7 +333,7 @@ if ($act == 'newevent') { color: #9f9f9f; margin: 0 auto; cursor: pointer; - font-size: 14px; + font-size: 12px; display: flex; background-color:#f3f3f3; border-radius: 8px; @@ -342,11 +342,11 @@ if ($act == 'newevent') { } .datarepair img { - width: 16px; - height: 16px; - margin-right: 5px; - margin-left: 10px; - margin-top: 6px; + width: 12px; + height: 12px; + margin-right: 10px; + margin-left: 15px; + margin-top: 7px; } #gameinfo { @@ -423,7 +423,7 @@ if ($act == 'newevent') { justify-content: space-between; align-items: center; position: relative; - top: -15px; + top: 18px; right: 2%; z-index: 1000; float: right; @@ -633,18 +633,19 @@ if ($act == 'newevent') { .fujian img { width: 14px; - height: 12px; margin-right: 7px; margin-left: 14px; } + .ximg { + margin-right: 0px !important; + margin-left: 5px !important; + margin-top: 2px; + cursor:pointer; + } .tianjia { - width: 15px; - height: 15px; margin-right: 0px; - position: absolute; - top: 10px; - right: 0; + margin-top: 10px; } .fujian-box { @@ -674,25 +675,38 @@ if ($act == 'newevent') { } .tijiao { - width: 60px; - height: 25px; + width: 280px; + height: 34px; + line-height:34px; background-color: #5fadff; font-size: 14px; text-align: center; - line-height: 25px; color: #fff; - border-radius: 4px; + border-radius: 8px; float: right; cursor: pointer; - margin-top: 25px; + margin-top: -5px; } .upfujian { width: 100%; - margin: 0 20px; + margin: 0 13px; } .listhove { box-shadow: 0px 0px 5px #40a9ff; } + + input::-webkit-input-placeholder,textarea::-webkit-input-placeholder { /* WebKit browsers*/ + color:#c3c3c3; + } + input:-moz-placeholder { /* Mozilla Firefox 4 to 18*/ + color:#c3c3c3; + } + input:-moz-placeholder { /* Mozilla Firefox 19+*/ + color:#c3c3c3; + } + input:-ms-input-placeholder { /* Internet Explorer 10+*/ + color:#c3c3c3; + }
- +
-
+
- +
@@ -762,7 +776,7 @@ if ($act == 'newevent') { target="_hideiframe" action="" enctype="multipart/form-data"> + onchange="document.getElementById('uploader_yy').submit()" style='opacity: 0;position: absolute; top:20px; z-index: 1001;'>
提交
@@ -781,7 +795,7 @@ if ($act == 'newevent') {
- +
@@ -789,13 +803,13 @@ if ($act == 'newevent') {
@@ -853,17 +867,20 @@ if ($act == 'newevent') { + + @@ -874,6 +891,31 @@ if ($act == 'newevent') { var dict = {}; var notid; + function deletefujian(id){ + + if("" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1")return + + $.ajax({ + url: './?app=uploader&act=del', + dataType: 'json', + data: { + id: notid, + key: id + }, + success: function (res) { + console.log(res); + alert('删除成功'); + showEventData(notid); + textdisabled(); + }, + error: function () { + alert('数据异常,请稍后重试!!!'); + showEventData(notid); + textdisabled(); + } + }); + } + // function isFocusyf(){ // var aa = $('#') // $("#listyf").addClass('listhove'); @@ -949,7 +991,7 @@ if ($act == 'newevent') { var cptext = $("#cptext").val(); var myDate = new Date(); var year = myDate.getFullYear(); //获取当前年份(2位) - var month = myDate.getMonth(); + var month = myDate.getMonth()+1; var day = myDate.getDate(); var branch = myDate.getHours(); //获取当前小时数(0-23) var second = myDate.getMinutes(); //获取当前分钟数(0-59) @@ -971,10 +1013,12 @@ if ($act == 'newevent') { console.log(res); alert('提交成功'); showEventData(notid); + textdisabled(); }, error: function () { alert('数据异常,请稍后重试!!!'); showEventData(notid); + textdisabled(); } }); }) @@ -983,7 +1027,7 @@ if ($act == 'newevent') { var yytext = $("#yytext").val(); var myDate = new Date(); var year = myDate.getFullYear(); //获取当前年份(2位) - var month = myDate.getMonth(); + var month = myDate.getMonth()+1; var day = myDate.getDate(); var branch = myDate.getHours(); //获取当前小时数(0-23) var second = myDate.getMinutes(); //获取当前分钟数(0-59) @@ -1003,10 +1047,12 @@ if ($act == 'newevent') { console.log(res); alert('提交成功'); showEventData(notid); + textdisabled(); }, error: function () { alert('数据异常,请稍后重试!!!'); showEventData(notid); + textdisabled(); } }); }) @@ -1016,7 +1062,7 @@ if ($act == 'newevent') { var yftext = $("#yftext").val(); var myDate = new Date(); var year = myDate.getFullYear(); //获取当前年份(2位) - var month = myDate.getMonth(); + var month = myDate.getMonth()+1; var day = myDate.getDate(); var branch = myDate.getHours(); //获取当前小时数(0-23) var second = myDate.getMinutes(); //获取当前分钟数(0-59) @@ -1035,14 +1081,25 @@ if ($act == 'newevent') { console.log(res); alert('提交成功'); showEventData(notid); + textdisabled(); }, error: function () { alert('数据异常,请稍后重试!!!'); showEventData(notid); + textdisabled(); } }); }) + function textdisabled(){ + $('#yytext').attr('disabled', false) + $('#yftext').attr('disabled', false) + $('#cptext').attr('disabled', false) + $("#upfujian_yy").hide(); + $("#upfujian_cp").hide(); + $("#upfujian_yf").hide(); + } + var i = 0; function bianji() { @@ -1545,28 +1602,47 @@ if ($act == 'newevent') { document.getElementById("yftext").innerHTML = yanfa_remark.msg; document.getElementById("yftime").innerHTML = yanfa_remark.date; } - - var fujian = JSON.parse(res.fujian); - console.log(fujian); var arrcp = []; var arryy = []; var arryf = []; - for (let i in fujian) { - if (fujian[i]['bumen'] == 'chanpin') { - arrcp.push(fujian[i]) - console.log(arrcp); + // 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]) + } + } + console.log(arrcp.length) + console.log(arryy.length) + console.log(arryf) + if(arrcp.length != 0){ tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法 document.getElementById("fujianname").innerHTML = tmpltxt(arrcp);//数据渲染 - } else if (fujian[i]['bumen'] == 'yunyig') { - arryy.push(fujian[i]) + }else { + var data = "
未添加附件
"; + $('#fujianname').html(data); + } + + if(arryy.length != 0){ tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法 document.getElementById("yyfujian").innerHTML = tmpltxt(arryy);//数据渲染 - } else if (fujian[i]['bumen'] == 'yanfa') { - arryf.push(fujian[i]) + }else { + var data = "
未添加附件
"; + $('#yyfujian').html(data); + } + + if(arryf.length != 0){ tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法 document.getElementById("yffujian").innerHTML = tmpltxt(arryf);//数据渲染 + }else { + var data = "
未添加附件
"; + $('#yffujian').html(data); } - } + }, error: function () { alert('数据异常,请稍后重试!!!') diff --git a/uploader.php b/uploader.php index 73c96f1..e05d130 100644 --- a/uploader.php +++ b/uploader.php @@ -15,6 +15,7 @@ if ($act == 'add') { $newName = "/uploader/{$id}.{$houzhui}"; $fileData[$id] = array( + "key" => $id, "name" => $filename, "bumen" => r('bumen'), "file" => $newName