diff --git a/assets/css/ace.min.css b/assets/css/ace.min.css
index eaec906..91c1565 100644
--- a/assets/css/ace.min.css
+++ b/assets/css/ace.min.css
@@ -14923,6 +14923,33 @@ th[aria-selected='true'] .ui-jqgrid-sortable {
     }
 }
 
+@media only screen and (max-width:1100px) {
+    .data_tab {
+        width: 270px !important;
+    }
+    .datarepair {
+        top: 85px !important;
+    }
+}
+
+@media only screen and (max-width:830px) {
+    .data_tab {
+        width: 200px !important;
+    }
+    .datarepair {
+        top: 107px !important;
+    }
+}
+
+@media only screen and (max-width:688px) {
+    .data_tab {
+        width: 100px !important;
+    }
+    .datarepair {
+        top: 160px !important;
+    }
+}
+
 .jqstooltip,
 .legendColorBox div {
 	-webkit-box-sizing: content-box;
diff --git a/pmcalendar.php b/pmcalendar.php
index e55f7ae..f100332 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);//更新运营中心编辑权限
@@ -305,8 +305,8 @@ if ($act == 'newevent') {
                 </div>
                 <div id="gamesbtn" style="padding:0 11px 15px 11px;">
                     <!-- 筛选： -->
-                    <?php if ($canEdit) { ?><a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a><? } ?>
-                    <!-- <a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a> -->
+                    <!-- <?php if ($canEdit) { ?><a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a><? } ?> -->
+                    <a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a>
                     <button value='' onclick='onlyShowGame(this)' class='btn btn-minier btn-info'>显示全部</button>
                     <?php
                     foreach ($GAMES as $g) {
@@ -730,7 +730,7 @@ if ($act == 'newevent') {
     }
 </style>
 <div class='popup-bg' id='popup-bg'>
-    <div class="yiny" id='yiny'></div>
+    <div class="yiny" id='yiny' onclick="guanbi()"></div>
     <div class='popup-box'>
         <div class="pop-top">
             <div class='bianji' onclick='bianji()'><img src='assets/images/bianji.png'/></div>
@@ -919,6 +919,7 @@ if ($act == 'newevent') {
     var arrcp = [];
     var arryy = [];
     var arryf = [];
+    var starts ='';
 
     function deletefujian(id){
 
@@ -1329,6 +1330,7 @@ if ($act == 'newevent') {
                 bumen = calEvent.className[0]
                 console.log(calEvent.className[0])
                 notid = calEvent.id;
+                starts = calEvent.start;
                 // if ("<?=$canEdit?>" != "1") {
 
                     if (calEvent.className[0] == 'label-danger') {
@@ -1388,18 +1390,18 @@ if ($act == 'newevent') {
                     } else {
                         if ("<?=$canEdit?>" == "1") {
                             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'));
-                            });
+                            // $.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');
                            Info();
 
@@ -1682,8 +1684,7 @@ if ($act == 'newevent') {
         });
     }
 
-    $("#yiny").click(function () {
-        // location.reload();
+    function guanbi(){
         var showGame = "";
         starttime, endtime;
         dstr = ''
@@ -1693,12 +1694,42 @@ if ($act == 'newevent') {
         arrcp = [];
         arryy = [];
         arryf = [];
+        starts=''
         $("#popup-bg").hide();
         $('body,html').css('overflow', 'auto')
-    })
+    }
+
+    // $("#yiny").click(function () {
+    //     var showGame = "";
+    //     starttime, endtime;
+    //     dstr = ''
+    //     dict = {};
+    //     bumen;
+    //     notid;
+    //     arrcp = [];
+    //     arryy = [];
+    //     arryf = [];
+    //     starts=''
+    //     $("#popup-bg").hide();
+    //     $('body,html').css('overflow', 'auto')
+    // })
 
     function Info() {
         if ("<?=$canEdit?>" != "1") return;
+        dict = {};
+        $.post('./?app=pmcalendar&act=getEventByid', {id: notid}, function (txt) {
+            var j = JSON.parse(txt);
+            dict.start = j.start;
+            dict.end = j.end;
+            dict.id = notid;
+            $('#game').val(j.game);
+            $('#hour').val(j.shour);
+            $('#min').val(j.smin);
+            $('#event').val(j.event);
+            $('#title').val(j.title);
+            hourChange($('#hour'));
+        });
+
         showEventInfo(dstr, {
             "save": {
                 "label": "<i class='icon-check'></i> 保存",
@@ -1728,11 +1759,12 @@ if ($act == 'newevent') {
                 "callback": function () {
                     if (confirm('确认要【删除】这个事件吗？')) {
                         loading.show();
-                        $.post('./?app=pmcalendar&act=delevent', {id: calEvent.id}, function (txt) {
+                        $.post('./?app=pmcalendar&act=delevent', {id: notid}, function (txt) {
                             loading.hide();
                             if (txt == '1') {
                                 calendar.fullCalendar('refetchEvents');
                             }
+                            guanbi();
                         });
                     }
                 }