From 834b2bc2e799fe1081c5c06f247d465d3725b171 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Thu, 10 Dec 2020 17:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/ace.min.css | 2 +- assets/css/fullcalendar.css | 1 + config.json | 2 +- pmcalendar.php | 31 +++++++++++++++++++++---------- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/assets/css/ace.min.css b/assets/css/ace.min.css index 4cbc077..98d4bf3 100644 --- a/assets/css/ace.min.css +++ b/assets/css/ace.min.css @@ -2692,7 +2692,7 @@ button.btn:active { .btn-default:focus { background-color: #fff !important; border: 1px solid #e2e2e2; - color: #8b8b8b !important; + color: #636363 !important; font-weight: initial; } .btn:hover, diff --git a/assets/css/fullcalendar.css b/assets/css/fullcalendar.css index 59e4228..8f49302 100644 --- a/assets/css/fullcalendar.css +++ b/assets/css/fullcalendar.css @@ -122,6 +122,7 @@ html .fc, clear: both; zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */ top: 50px; + margin: 0 11px; } .fc-view { diff --git a/config.json b/config.json index 314abd1..229b94f 100644 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"games":["\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6b4c\u624bCOCOS","\u8bd9\u8c10\u4e09\u56fd","\u751f\u5316\u7eaa\u5143","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5996\u7075\u6218\u59ec","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u98ce\u66b4\u5947\u5175","\u4e2d\u53e4\u6218\u9524","\u50cf\u7d20\u9879\u76ee","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u7f57\u677e\u67cf"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676"],"gxcperoles":[""],"gxyferoles":["\u5434\u660a"],"xfvroles":[""],"xfyyeroles":["\u5434\u660a"]} \ No newline at end of file +{"games":["\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6b4c\u624bCOCOS","\u8bd9\u8c10\u4e09\u56fd","\u751f\u5316\u7eaa\u5143","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5996\u7075\u6218\u59ec","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u98ce\u66b4\u5947\u5175","\u4e2d\u53e4\u6218\u9524","\u50cf\u7d20\u9879\u76ee","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u7f57\u677e\u67cf"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676"],"gxcperoles":[""],"gxyferoles":["\u5434\u660a"],"xfvroles":[""],"xfyyeroles":["\u5434\u660a"],"dbyyeroles":["\u7f57\u677e\u67cf"],"dbyferoles":["\u7f57\u677e\u67cf"]} \ No newline at end of file diff --git a/pmcalendar.php b/pmcalendar.php index 2d780e2..0b3b5fe 100644 --- a/pmcalendar.php +++ b/pmcalendar.php @@ -2,7 +2,7 @@ $user = SESS::get('EVENTUserInfo'); // if(isn($user))exit(); $user = json_decode($user, true); -// $user['name'] = "罗松柏"; +$user['name'] = "罗松柏"; $canEdit = in_array($user['name'], $ROLES); $isgxvrole ='1'; //in_array($user['name'], $GXVROLES); //更新信息查看区浏览权限 $isgxyyerole = in_array($user['name'], $GXYYEROLES);//更新运营中心编辑权限 @@ -310,8 +310,8 @@ if ($act == 'newevent') {
- 编辑游戏 - + + 编辑游戏
- +
@@ -829,7 +829,7 @@ if ($act == 'newevent') {
- +
@@ -1341,7 +1341,7 @@ if ($act == 'newevent') { notid = calEvent.id; starts = calEvent.start; // if ("" != "1") { - + console.log("") if (calEvent.className[0] == 'label-danger') { if ("" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1") { return @@ -1384,7 +1384,7 @@ if ($act == 'newevent') { $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add') $("#listcp").hide(); $("#listyf").hide(); - + // $("#yytext").attr('placeholder','填写本次更新概要，详细更新内容请使用附件') //console.log($('#uploader').attr('action')) dict = {}; @@ -1406,7 +1406,7 @@ if ($act == 'newevent') { ; } else if(calEvent.className[0] == 'label-warning'){ - if ("" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1") { + if ("" != "1" && "" != "1" && "" != "1" && "" != "1" && "" != "1") { return } else { $('#uploader').attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=chanpin&act=add'); @@ -1415,6 +1415,11 @@ if ($act == 'newevent') { $("#listcp").show(); $("#listyf").show(); + $("#cptext").attr('placeholder','请填写版本计划内容概要，内容较多请使用附件'); + $("#yytext").attr('placeholder','请填写预计更新时间计划以及其他要点概要，内容较多请使用附件'); + $("#yftext").attr('placeholder','请填写本次节点修改内容注意事项，内容较多请使用附件'); + + //console.log($('#uploader').attr('action')) dict = {}; @@ -1745,7 +1750,13 @@ if ($act == 'newevent') { arrcp = []; arryy = []; arryf = []; - starts='' + starts=''; + $('#yytext').attr('disabled', false) + $('#cptext').attr('disabled', false) + $('#yftext').attr('disabled', false) + $("#upfujian_yy").hide(); + $("#upfujian_cp").hide(); + $("#upfujian_yf").hide(); $("#popup-bg").hide(); $('body,html').css('overflow', 'auto') }