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,    /* <th>, usually */
 .fc-widget-content {  /* <td>, usually */
-	border: 1px solid #f3f3f3;
+	border: 1px solid #e8e8e8;
 	}
 	
 .fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
-    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 cc2a579..f366b3f 100644
Binary files a/assets/images/tongji.png and b/assets/images/tongji.png differ
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;
                     }
                 </style>
 
@@ -466,6 +467,9 @@ if ($act == 'newevent') {
                         border: 0px !important;
                         text-align: center;
                     }
+                    .fc-week {
+                        background-color:#f7f7f7;
+                    }
                 </style>
                 <div class='datarepair' id="datarepair" onclick="datarepair()">
                     <img src='assets/images/tongji.png' id="dataimg"/> <span id='datarepairname'>查看统计</span>
@@ -778,7 +782,7 @@ if ($act == 'newevent') {
                 <div class='cptime' id='yytime'></div>
             </div>
             <div class='cptext-box'>
-                <textarea disabled='disabled' id='yytext' onblur="isFocusyy()" placeholder="添加运营中心对本节点的描述"></textarea>
+                <textarea disabled='disabled' id='yytext' onblur="isFocusyy()" placeholder="填写本次更新概要，详细更新内容请使用附件"></textarea>
             </div>
             <div class='fujian-box'>
 
@@ -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 ("<?=$isgxvrole?>" != "1" && "<?=$isgxyyerole?>" != "1" && "<?=$isgxcperole?>" != "1" && "<?=$isgxyferole?>" != "1" && "<?=$canEdit?>" != "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 ("<?=$canEdit?>" == "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);//生成模板方法