From b62064b33bb9e5d7c16400a5cd773175971c12bd Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 31 Dec 2020 10:17:57 +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

---
 pmcalendar.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pmcalendar.php b/pmcalendar.php
index bbdbbb0..92574cf 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);//更新运营中心编辑权限
@@ -326,8 +326,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) {
@@ -1119,7 +1119,7 @@ if ($act == 'newevent') {
                         toolbox: {
                             show: true,
                             orient: 'vertical',
-                            right: '1.5%',
+                            right: '0%',
                             top: 'center',
                             feature: {
                                 mark: {show: true},
@@ -1148,6 +1148,14 @@ if ($act == 'newevent') {
                         dataset: {
                             source: chartsdata
                         },
+                        dataZoom: [
+                            {
+                                id: 'dataZoomX',
+                                type: 'slider',
+                                xAxisIndex: [0],
+                                filterMode: 'filter'
+                            }
+                        ],
                         xAxis: {
                             type: 'category',
                             axisLabel:{
@@ -1757,9 +1765,14 @@ if ($act == 'newevent') {
                         }
                         ;
                     } else if (calEvent.className[0] == 'label-purple') {
+                        console.log("<?=$isxfvrole?>")
+                        console.log("<?=$isxfyyerole?>")
+                        console.log("<?=$canEdit?>")
                         if ("<?=$isxfvrole?>" != "1" && "<?=$isxfyyerole?>" != "1" && "<?=$canEdit?>" != "1") {
+                            console.log(2222)
                             return
                         } else {
+                            console.log(1111)
                             $('#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')