前端

assets/css/fullcalendar.css

@@ -36,17 +36,32 @@ html .fc,
 	}
 
 .fc-header-left {
-	width: 25%;
+	width: 415px;
-	text-align: left;
+    text-align: center;
+    position: absolute;
+    margin: 0 auto;
+    left: 170px;
+    right: 0;
+    z-index: 100000;
+    display: flex;
+    justify-content: space-between;
 	}
 	
 .fc-header-center {
-	text-align: center;
+    text-align: center;
+    z-index: 1100;
+    position: absolute;
+    margin: 0 auto;
+    left: 0;
+    right: 0;
 	}
 	
 .fc-header-right {
 	width: 25%;
-	text-align: right;
+    text-align: left;
+    position: absolute;
+    left: 11px;
+    z-index: 100000;
 	}
 	
 .fc-header-title {
@@ -60,7 +75,8 @@ html .fc,
 	}
 	
 .fc .fc-header-space {
-	padding-left: 10px;
+    padding-left: 10px;
+    display: none;
 	}
 	
 .fc-header .fc-button {
@@ -102,7 +118,8 @@ html .fc,
 	
 .fc-content {
 	clear: both;
-	zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
+    zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
+    top: 50px;
 	}
 	
 .fc-view {
@@ -138,13 +155,13 @@ html .fc,
 .fc-button {
 	position: relative;
 	display: inline-block;
-	padding: 0 1em;
+	padding: 0 1.4em;
 	overflow: hidden;
 	height: 1.9em;
 	line-height: 1.9em;
 	white-space: nowrap;
 	cursor: pointer;
-	border-radius: 15px !important ;
+	border-radius: 10px !important ;
 	}
 	
 .fc-state-default { /* non-theme */
@@ -219,7 +236,8 @@ html .fc,
 .fc-state-active,
 .fc-state-disabled {
 	color: #333333;
-	background-color: #e6e6e6;
+    background-color: #fff;
+    /* display: none; */
 	}
 
 .fc-state-hover {
@@ -234,7 +252,7 @@ html .fc,
 
 .fc-state-down,
 .fc-state-active {
-	background-color: #5fadff;
+	background-color: #0078f7;
 	color: #fff;
 	background-image: none;
 	outline: 0;
@@ -246,7 +264,8 @@ html .fc,
 	background-image: none;
 	opacity: 0.65;
 	filter: alpha(opacity=65);
-	box-shadow: none;
+    box-shadow: none;
+    /* display: none; */
 	}
 
 	
@@ -269,10 +288,11 @@ html .fc,
 	color: #fff;               /* default TEXT color */
 	font-size: .85em;
 	cursor: default;
-	border-radius: 8px !important;
+	border-radius: 0px !important;
-	padding: 5px;
+	padding: 10px 5px 10px 15px;
-	margin: 5px 12px 0 12px;
+	margin: 10px 12px 0px 12px;
-	cursor:pointer;
+    cursor:pointer;
+    font-weight: bold;
 	}
 
 	@media only screen and (max-width:360px) {
@@ -404,7 +424,8 @@ table.fc-border-separate {
 	
 .fc-border-separate tbody tr.fc-first td,
 .fc-border-separate tbody tr.fc-first th {
-	border-top-width: 0;
+    border-top-width: 0;
+    padding-bottom: 10px;
 	}
 	
 	
@@ -429,7 +450,7 @@ table.fc-border-separate {
 	
 .fc-grid .fc-day-number {
 	text-align: right;
-	padding: 10px 2px;
+	padding: 10px;
 	}
 	
 .fc-grid .fc-other-month .fc-day-number {

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":["\u5434\u660a","\u8212\u5c55","\u9093\u5b9a\u658c","dddd","ddd"],"chanpin":["\u5434\u660a"],"yunying":["\u5434\u660a"],"yanfa":["\u5434\u660a"],"gxvroles":["aaaaa","555"],"gxyyeroles":["bbb"],"gxcperoles":["cccc"],"gxyferoles":["ddddd"],"xfvroles":["eeeee"],"xfyyeroles":["ffff"]}
+{"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":["\u5434\u660a","\u8212\u5c55","\u9093\u5b9a\u658c","dddd","ddd"],"gxvroles":["aaaaa","555"],"gxyyeroles":["\u5434\u660a"],"gxcperoles":["\u5434\u660a"],"gxyferoles":["\u5434\u660a","\u7f57\u677e\u67cf"],"xfvroles":["\u5434\u660a"],"xfyyeroles":["\u5434\u660a"]}

pmcalendar.php

@@ -31,7 +31,7 @@ if ($act == 'newevent') {
 } else if ($act == 'edityunying') {
     $id = r('id');
     $dict = array(
-        'yunying_remark' => r('content')
+        'yunying_remark' => stripslashes(r('content'))
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");
@@ -40,7 +40,7 @@ if ($act == 'newevent') {
 } else if ($act == 'edityanfa') {
     $id = r('id');
     $dict = array(
-        'yanfa_remark' => r('content')
+        'yanfa_remark' => stripslashes(r('content'))
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");
@@ -49,7 +49,7 @@ if ($act == 'newevent') {
 } else if ($act == 'editchanpin') {
     $id = r('id');
     $dict = array(
-        'chanpin_remark' => r('content')
+        'chanpin_remark' => stripslashes(r('content'))
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");
@@ -103,6 +103,15 @@ if ($act == 'newevent') {
 
     $sql = "select * from calendar where ((start>='{$startDate}' and start<='{$endDate}') or (end>='{$startDate}' and end<='{$endDate}'))  {$where}";
     $rss = DB::getArray($sql);
+    $eventTypeCnt = array(
+        '节点' => 0,
+        '打包' => 0,
+        '版本更新' => 0,
+        '上线' => 0,
+        '修复外网' => 0
+
+
+    );
     $eventCount = array(
         '总更新&总修复' => array(
             'dangerCount' => 0,
@@ -118,6 +127,9 @@ if ($act == 'newevent') {
                 'purpleCount' => 0
             );
         }
+        if (strstr($rs['end'], $month)) {
+            $eventTypeCnt[$rs['event']] += 1;
+        }
         $class = "light";
         if ($rs['event'] == '节点') {
             $class = "success";
@@ -191,8 +203,10 @@ if ($act == 'newevent') {
     if ($type == 'charts')
         // we(json_encode($eventCharts));
         we(json_encode(array('charts' => $eventCharts, 'table' => $eventTable)));
-    else
+    else{
+        $json['count'] = $eventTypeCnt;
         we(json_encode($json));
+    }
 }
 ?>
 <!DOCTYPE html>
@@ -285,10 +299,12 @@ if ($act == 'newevent') {
         <div class="main-content">
             <div class="page-content">
                 <div class="page-header">
-                    <h1>LeGu Event</h1>
+                    <!-- <h1>LeGu Event</h1> -->
+                    <img src="assets/images/logo.png">
+                    <div class='xian2'></div>
                 </div>
-                <div id="gamesbtn">
+                <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>
                     <button value='' onclick='onlyShowGame(this)' class='btn btn-minier btn-info'>显示全部</button>
@@ -302,28 +318,41 @@ if ($act == 'newevent') {
                 </div>
 
                 <style>
+                    .xian2 {
+                        width: calc(100% - 200px);
+                        height: 1px;
+                        background-color:#f3f3f3;
+                    }
                     .datarepair {
                         z-index: 1000;
                         width: 100px;
-                        height: 40px;
+                        height: 27px;
+                        line-height: 27px;
                         position: relative;
-                        top: 40px;
+                        top: 60px;
-                        color: #6fb3e0;
+                        color: #9f9f9f;
                         margin: 0 auto;
                         cursor: pointer;
-                        font-size: 16px;
+                        font-size: 14px;
                         display: flex;
+                        background-color:#f3f3f3;
+                        border-radius: 8px;
+                        text-align: center;
+                        margin-bottom: 15px;
                     }
 
                     .datarepair img {
-                        width: 20px;
+                        width: 16px;
-                        height: 20px;
+                        height: 16px;
                         margin-right: 5px;
-                        margin-top: 3px;
+                        margin-left: 10px;
+                        margin-top: 6px;
                     }
 
                     #gameinfo {
-                        margin: 15px 0
+                        /* margin: 15px 0; */
+                        height: 13px;
+                        background-color:#f5f5f9;
                     }
 
                     #gameinfo li {
@@ -382,17 +411,84 @@ if ($act == 'newevent') {
                     .data_box {
                         display: none;
                     }
+
+                    .data_tab {
+                        width: 325px;
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        position: relative;
+                        top: 18px;
+                        right: 11px;
+                        z-index: 1000;
+                        float: right;
+                    }
+
+                    .data-box {
+                        width: 80px;
+                        text-align: center;
+                        display: flex;
+                        align-items: center;
+                    }
+
+                    .data-box img {
+                        width: 24px;
+                        /* margin: 0 auto; */
+                        margin-right: 5px
+                    }
+
+                    .data-box .data-name {
+                        font-size: 12px;
+                        color: #8e8e8e;
+                        text-align: center;
+                    }
+
+                    .data-box .data-num {
+                        font-size: 14px;
+                        color: #a0a0a0;
+                        text-align: center;
+                    }
+                    .formtab {
+                        padding: 27px 0px !important;
+                        color:#474747 !important;
+                        border: 0px !important;
+                    }
                 </style>
                 <div class='datarepair' id="datarepair" onclick="datarepair()">
-                    <img src='assets/images/xiazai.png'/> 修复数据
+                    <img src='assets/images/tongji.png' id="dataimg"/> <span id='datarepairname'>查看统计</span>
+                </div>
+                <div class='data_tab'>
+                    <div class='data-box'>
+                        <img src="assets/images/dabao.png"/>
+                        <p class="data-name">打包</p>
+                        <p class="data-num" id="dabaonum"></p>
+                    </div>
+
+                    <div class='data-box'>
+                        <img src="assets/images/gengxin.png"/>
+                        <p class="data-name">更新</p>
+                        <p class="data-num" id="gengxinnum"></p>
+                    </div>
+
+                    <div class='data-box'>
+                        <img src="assets/images/xiufu.png"/>
+                        <p class="data-name">修复</p>
+                        <p class="data-num" id="xiufunum"></p>
+                    </div>
+
+                    <div class='data-box'>
+                        <img src="assets/images/jeidian.png"/>
+                        <p class="data-name">节点</p>
+                        <p class="data-num" id="jeidiannum"></p>
+                    </div>
                 </div>
                 <div class='data_box' id='data_box'>
 
-                    <div id="chart" class="chartbox" style="width:100%;height:400px; margin-top:50px;"></div>
+                    <div id="chart" class="chartbox" style="width:100%;height:400px; margin-top:90px;"></div>
 
                     <div class="card-body">
-                        <table class="table table-bordered table-striped">
+                        <table class="table table-bordered table-striped" style='border:0px !important'>
-                            <thead id="thead-title" class="thead"></thead>
+                            <thead id="thead-title" class="thead" ></thead>
                             <tbody id="tbody-content"></tbody>
                         </table>
                     </div>
@@ -534,7 +630,10 @@ if ($act == 'newevent') {
     .tianjia {
         width: 15px;
         height: 15px;
-        margin-right: 15px;
+        margin-right: 0px;
+        position: absolute;
+        top: 10px;
+        right: 0;
     }
 
     .fujian-box {
@@ -551,20 +650,41 @@ if ($act == 'newevent') {
     .fujian a {
         color: #61adfe;
     }
-    input[type="file"] { padding: 0 14px; }
+
-    .tijaioanniu { 
+    input[type="file"] {
+        padding: 0 14px;
+    }
+
+    .tijaioanniu {
         display: flex;
         justify-content: space-between;
         align-items: center;
         /* padding: 10px 0;  */
     }
-    .tijiao { width: 60px; height: 25px; background-color:#5fadff; font-size: 14px; text-align: center; line-height: 25px; color:#fff; border-radius: 4px; float: right; cursor:pointer;}
+
+    .tijiao {
+        width: 60px;
+        height: 25px;
+        background-color: #5fadff;
+        font-size: 14px;
+        text-align: center;
+        line-height: 25px;
+        color: #fff;
+        border-radius: 4px;
+        float: right;
+        cursor: pointer;
+        margin-top: 25px;
+    }
+    .upfujian {
+        width: 100%;
+        margin: 0 20px;
+    }
 </style>
 <div class='popup-bg' id='popup-bg'>
     <div class="yiny" id='yiny'></div>
     <div class='popup-box'>
         <div class="pop-top">
-            <div class='bianji'  onclick='bianji()'><img src='assets/images/bianji.png'/></div>
+            <div class='bianji' onclick='bianji()'><img src='assets/images/bianji.png'/></div>
             <div class="pop-title" id='pop-title' onclick='Info()'></div>
         </div>
         <div class="list-box">
@@ -584,10 +704,13 @@ if ($act == 'newevent') {
                 <div class='fujian' id='fujianname'></div>
                 <div class="tijaioanniu">
                     <div style=" position: relative; display: none" class="upfujian" id="upfujian_cp">
+                        <img class='tianjia' src='/assets/images/jiahao.png'/>
                         <iframe id="_hideiframe" name="_hideiframe" style="display: none;"></iframe>
-                        <form method="post" id="uploader" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                        <form method="post" id="uploader" style="display: block; clear: both; margin-top: 10px;;"
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                              target="_hideiframe" action="" enctype="multipart/form-data">
-                            <input type="file" id="fujian" name="fujian[]" multiple onchange="document.getElementById('uploader').submit()">
+                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" style='opacity: 0; position: absolute;z-index: 1001;'/>
+                            <input type="file" id="fujian" name="fujian[]" multiple
+                                   onchange="document.getElementById('uploader').submit()"  style='opacity: 0; position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="cptijiao">提交</div>
 
@@ -619,16 +742,19 @@ if ($act == 'newevent') {
                 </div> -->
                 <div class="tijaioanniu">
                     <div style=" position: relative;display: none;" class="upfujian" id="upfujian_yy">
+                        <img class='tianjia' src='/assets/images/jiahao.png'/>
                         <iframe id="_hideiframe2" name="_hideiframe" style="display: none;"></iframe>
-                        <form method="post" id="uploader_yy" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                        <form method="post" id="uploader_yy" style="display: block; clear: both; margin-top: 10px;;"
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                              target="_hideiframe" action="" enctype="multipart/form-data">
-                            <input type="file" id="fujian_yy" name="fujian[]" multiple onchange="document.getElementById('uploader_yy').submit()">
+                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" style='opacity: 0; position: absolute;z-index: 1001;'/>
+                            <input type="file" id="fujian_yy" name="fujian[]" multiple
+                                   onchange="document.getElementById('uploader_yy').submit()" style='opacity: 0;position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="yytijiao">提交</div>
                     </div>
                 </div>
 
-                
+
             </div>
         </div>
 
@@ -644,20 +770,23 @@ if ($act == 'newevent') {
                 <textarea disabled='disabled' id='yftext'></textarea>
             </div>
             <div class='fujian-box'>
-            
+
                 <!-- 附件 -->
                 <div class='fujian' id='yffujian'></div>
                 <div class="tijaioanniu">
                     <div style=" position: relative;display: none;" class="upfujian" id="upfujian_yf">
+                        <img class='tianjia' src='/assets/images/jiahao.png'/>
                         <iframe id="_hideiframe3" name="_hideiframe" style="display: none;"></iframe>
-                        <form method="post" id="uploader_yf" style="display: block; clear: both; margin-top: 10px;;" target="_hideiframe" action="" enctype="multipart/form-data">
+                        <form method="post" id="uploader_yf" style="display: block; clear: both; margin-top: 10px;;"
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" />
+                              target="_hideiframe" action="" enctype="multipart/form-data">
-                            <input type="file" id="fujian_yf" name="fujian[]" multiple onchange="document.getElementById('uploader_yf').submit()">
+                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>" style='opacity: 0; position: absolute;z-index: 1001;'/>
+                            <input type="file" id="fujian_yf" name="fujian[]" multiple
+                                   onchange="document.getElementById('uploader_yf').submit()" style='opacity: 0; position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="yftijiao">提交</div>
                     </div>
                 </div>
-                
+
             </div>
         </div>
 
@@ -675,10 +804,10 @@ if ($act == 'newevent') {
 <script src="assets/js/date-time/daterangepicker.min.js"></script>
 
 <script type="text/x-dot-template" id="thead-dot">
-    <tr>
+    <tr style="background:#fafafa !important;">
         {{~it:item:index}}
 
-        <th>{{=item}}</th>
+        <th class='formtab' style="padding: 25px 0px; color:#474747; border: 0px;">{{=item}}</th>
 
         {{~}}
     </tr>
@@ -696,17 +825,17 @@ if ($act == 'newevent') {
 
 <script type="text/x-dot-template" id="fujian-dot">
     {{~it:item:index}}
-        {{? item != ''}}
+    {{? item != ''}}
-            <img src="/assets/images/xiazai.png"/>
+    <img src="/assets/images/xiazai.png"/>
-            <div id='cpfuinfo'>
+    <div id='cpfuinfo'>
-                <a href='http://leguevent.local{{= item.file}}'>{{= item.name}}</a>
+        <a href='http://leguevent.local{{= item.file}}'>{{= item.name}}</a>
-            </div>
+    </div>
-        {{??}}
+    {{??}}
-        <div class='fujian'>
+    <div class='fujian'>
-            <img src="/assets/images/fujian.png"/>
+        <img src="/assets/images/fujian.png"/>
-            未添加附件
+        未添加附件
-        </div>
+    </div>
-        {{?}}
+    {{?}}
     {{~}}
 </script>
 
@@ -717,11 +846,11 @@ if ($act == 'newevent') {
     var dict = {};
     var notid;
 
-    $('#fujian').change(function(){
+    $('#fujian').change(function () {
         var wenjianname = $('#fujian').val();
         var obj = document.getElementById("fujian");
         var len = obj.files.length;
-        var temp ;
+        var temp;
         for (var i = 0; i < len; i++) {
             temp = obj.files[i].name;
         }
@@ -733,13 +862,13 @@ if ($act == 'newevent') {
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
         document.getElementById("fujianname").innerHTML = tmpltxt(arr);//数据渲染
         // console.log('arr');
-   })
+    })
 
-   $("#fujian_yy").change(function(){
+    $("#fujian_yy").change(function () {
         var wenjianname = $('#fujian_yy').val();
         var obj = document.getElementById("fujian_yy");
         var len = obj.files.length;
-        var temp ;
+        var temp;
         for (var i = 0; i < len; i++) {
             temp = obj.files[i].name;
         }
@@ -750,13 +879,13 @@ if ($act == 'newevent') {
         arr.push(data)
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
         document.getElementById("yyfujian").innerHTML = tmpltxt(arr);//数据渲染
-   })
+    })
 
-   $("#fujian_yf").change(function(){
+    $("#fujian_yf").change(function () {
         var wenjianname = $('#fujian_yf').val();
         var obj = document.getElementById("fujian_yf");
         var len = obj.files.length;
-        var temp ;
+        var temp;
         for (var i = 0; i < len; i++) {
             temp = obj.files[i].name;
         }
@@ -767,53 +896,55 @@ if ($act == 'newevent') {
         arr.push(data)
         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
         document.getElementById("yffujian").innerHTML = tmpltxt(arr);//数据渲染
-   })
+    })
 
-   //产品提交
+    //产品提交
-   $('#cptijiao').click(function(){
+    $('#cptijiao').click(function () {
         var cptext = $("#cptext").val();
         var myDate = new Date();
-        var year= myDate.getFullYear();       //获取当前年份(2位)
+        var year = myDate.getFullYear();       //获取当前年份(2位)
-        var month= myDate.getMonth();
+        var month = myDate.getMonth();
-        var day=myDate.getDate();
+        var day = myDate.getDate();
-        var branch=myDate.getHours();       //获取当前小时数(0-23)
+        var branch = myDate.getHours();       //获取当前小时数(0-23)
-        var second=myDate.getMinutes();     //获取当前分钟数(0-59)
+        var second = myDate.getMinutes();     //获取当前分钟数(0-59)
 
         var arr = {}
         arr['msg'] = cptext,
-        arr['date'] = year+'-'+month+'-'+day+' '+ branch + ':'+ second
+            arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
         arr = JSON.stringify(arr)
         $.ajax({
             url: './?app=pmcalendar&act=editchanpin',
-            dataType: 'json',
+            dataType: 'application/x-www-form-urlencoded',
-            type:"post",
+            type: "post",
-            async:"true",
+            async: "true",
             data: {
                 id: notid,
                 content: arr
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
-   })
+    })
-   //运营
+    //运营
-   $('#yytijiao').click(function(){
+    $('#yytijiao').click(function () {
         var yytext = $("#yytext").val();
         var myDate = new Date();
-        var year= myDate.getFullYear();       //获取当前年份(2位)
+        var year = myDate.getFullYear();       //获取当前年份(2位)
-        var month= myDate.getMonth();
+        var month = myDate.getMonth();
-        var day=myDate.getDate();
+        var day = myDate.getDate();
-        var branch=myDate.getHours();       //获取当前小时数(0-23)
+        var branch = myDate.getHours();       //获取当前小时数(0-23)
-        var second=myDate.getMinutes();     //获取当前分钟数(0-59)
+        var second = myDate.getMinutes();     //获取当前分钟数(0-59)
 
         var arr = {}
         arr['msg'] = yytext,
-        arr['date'] = year+'-'+month+'-'+day+' '+ branch + ':'+ second
+            arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
         arr = JSON.stringify(arr)
         $.ajax({
             url: './?app=pmcalendar&act=edityunying',
@@ -824,26 +955,28 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
-   })
+    })
 
-   //研发
+    //研发
-   $('#yftijiao').click(function(){
+    $('#yftijiao').click(function () {
         var yftext = $("#yftext").val();
         var myDate = new Date();
-        var year= myDate.getFullYear();       //获取当前年份(2位)
+        var year = myDate.getFullYear();       //获取当前年份(2位)
-        var month= myDate.getMonth();
+        var month = myDate.getMonth();
-        var day=myDate.getDate();
+        var day = myDate.getDate();
-        var branch=myDate.getHours();       //获取当前小时数(0-23)
+        var branch = myDate.getHours();       //获取当前小时数(0-23)
-        var second=myDate.getMinutes();     //获取当前分钟数(0-59)
+        var second = myDate.getMinutes();     //获取当前分钟数(0-59)
         var arr = {}
         arr['msg'] = yftext,
-        arr['date'] = year+'-'+month+'-'+day+' '+ branch + ':'+ second
+            arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
         arr = JSON.stringify(arr)
         $.ajax({
             url: './?app=pmcalendar&act=edityanfa',
@@ -854,103 +987,68 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
-   })
+    })
 
     var i = 0;
-	function bianji(){
 
-        if("<?=$isgxyyerole?>"=="1"){
+    function bianji() {
-            if(i == 0){
+
-                $('#yytext').attr('disabled',false)
+        if ("<?=$isgxyyerole?>" == "1") {
+            if (i == 0) {
+                $('#yytext').attr('disabled', false)
                 $("#upfujian_yy").show();
                 i = 1;
-            }else {
+            } else {
-                $('#yytext').attr('disabled',true)
+                $('#yytext').attr('disabled', true)
                 $("#upfujian_yy").hide();
                 i = 0;
             }
         };
-        if("<?=$isgxcperole?>"=="1"){
+        console.log("<?=$isgxcperole?>")
-            if(i == 0){
+        if ("<?=$isgxcperole?>" == "1") {
-                $('#cptext').attr('disabled',false)
+            if (i == 0) {
+                $('#cptext').attr('disabled', false)
                 $("#upfujian_cp").show();
                 i = 1;
-            }else {
+            } else {
-                $('#cptext').attr('disabled',true)
+                $('#cptext').attr('disabled', true)
                 $("#upfujian_cp").hide();
                 i = 0;
             }
         };
-        console.log("<?=$isgxyferole?>")
+        if ("<?=$isgxyferole?>" == "1") {
-        if("<?=$isgxyferole?>"=="1"){
+            if (i == 0) {
-            if(i == 0){
+                $('#yftext').attr('disabled', false)
-                $('#yftext').attr('disabled',false)
                 $("#upfujian_yf").show();
                 upfujian_yf
                 i = 1;
-            }else {
+            } else {
-                $('#yftext').attr('disabled',true)
+                $('#yftext').attr('disabled', true)
                 $("#upfujian_yf").hide();
                 i = 0;
             }
         };
 
-        if("<?=$isxfyyerole?>"=="1"){
+        if ("<?=$isxfyyerole?>" == "1") {
-            if(i == 0){
+            if (i == 0) {
-                $('#yytext').attr('disabled',false)
+                $('#yytext').attr('disabled', false)
                 $("#upfujian_yy").show();
                 i = 1;
-            }else {
+            } else {
-                $('#yytext').attr('disabled',true)
+                $('#yytext').attr('disabled', true)
                 $("#upfujian_yy").hide();
                 i = 0;
             }
         };
-
+    }
-        if("<?=$canEdit?>"=="1"){
-            if(i == 0){
-                $('#cptext').attr('disabled',false)
-                $('#yytext').attr('disabled',false)
-                $('#yftext').attr('disabled',false)
-                $(".upfujian").show();
-                i = 1;
-            }else {
-                $('#cptext').attr('disabled',true)
-                $('#yytext').attr('disabled',true)
-                $('#yftext').attr('disabled',true)
-                $(".upfujian").hide();
-                i = 0;
-            }
-        };
-
-        // $canEdit = in_array($user['name'], $ROLES);
-        // $isgxvrole = in_array($user['name'], $GXVROLES);    //更新信息查看区浏览权限
-        // $isgxyyerole = in_array($user['name'], $GXYYEROLES);//更新运营中心编辑权限
-        // $isgxcperole = in_array($user['name'], $GXCPEROLES);//更新产品中心编辑权限
-        // $isgxyferole = in_array($user['name'], $GXYFEROLES);//更新研发中心编辑权限
-        // $isxfvrole = in_array($user['name'], $XFVROLES);    //修复信息查看区浏览权限
-        // $isxfyyerole = in_array($user['name'], $XFYYEROLES);//修复运营中心编辑权限
-
-
-		// if(i == 0){
-		// 	$('#cptext').attr('disabled',false)
-		// 	$('#yytext').attr('disabled',false)
-		// 	$('#yftext').attr('disabled',false)
-		// 	i = 1;
-		// }else {
-		// 	$('#cptext').attr('disabled',true)
-		// 	$('#yytext').attr('disabled',true)
-		// 	$('#yftext').attr('disabled',true)
-		// 	i = 0;
-		// }
-		
-	}
 
     function onlyShowGame(o) {
         if (o.value != '') {
@@ -985,7 +1083,7 @@ if ($act == 'newevent') {
                 next: '<i class="icon-chevron-right"></i>',
                 prevYear: '去年',
                 nextYear: '明年',
-                today: '今天',
+                today: '',
                 month: '月',
                 week: '周',
                 day: '日'
@@ -1016,15 +1114,21 @@ if ($act == 'newevent') {
                         game: showGame
                     },
                     success: function (doc) {
+                        console.log(doc);
                         callback(doc.calendarData);
-                        // console.log(doc);
+                        // console.log(doc);\
+                        $("#dabaonum").html("("+doc.count['打包']+")");
+                        $("#gengxinnum").html("("+doc.count['版本更新']+")");
+                        $("#xiufunum").html("("+doc.count['修复外网']+")");
+                        $("#jeidiannum").html("("+doc.count['节点']+")");
+                        console.log(doc.calendarData)
                         if (doc.gameInfo && doc.gameInfo.length > 0) {
                             var _html = [];
                             for (var i = 0; i < doc.gameInfo.length; i++) {
                                 var _v = doc.gameInfo[i];
                                 _html.push("<li>" + _v.end + " " + _v.event + " " + _v.title + "</li>");
                             }
-
+                            
                             $('#gameinfo ul').html(_html.join(''));
                         } else {
                             $('#gameinfo ul').html('');
@@ -1096,15 +1200,15 @@ if ($act == 'newevent') {
             eventClick: function (calEvent, jsEvent, view) {
                 console.log(calEvent.className[0])
                 notid = calEvent.id;
-                if("<?=$canEdit?>"!="1"){
+                // if ("<?=$canEdit?>" != "1") {
 
-                    if(calEvent.className[0] == 'label-danger'){
+                    if (calEvent.className[0] == 'label-danger') {
-                        if("<?=$isgxvrole?>"!="1" && "<?=$isgxyyerole?>"!="1" && "<?=$isgxcperole?>"!="1" && "<?=$isgxyferole?>"!="1"){
+                        if ("<?=$isgxvrole?>" != "1" && "<?=$isgxyyerole?>" != "1" && "<?=$isgxcperole?>" != "1" && "<?=$isgxyferole?>" != "1" && "<?=$canEdit?>" != "1") {
                             return
-                        }else{
+                        } else {
-                            $('#uploader').attr('action','./?app=uploader&id='+ calEvent.id +'&bumen=chanpin&act=add');
+                            $('#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_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')
+                            $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add')
 
                             //console.log($('#uploader').attr('action')) 
 
@@ -1123,14 +1227,15 @@ if ($act == 'newevent') {
                             });
                             dstr = $.fullCalendar.formatDate(calEvent.start, 'yyyy-MM-dd');
                             showEventData(calEvent.id);
-                        };
+                        }
-                    }else if(calEvent.className[0] == 'label-purple'){
+                        ;
-                        if("<?=$isxfvrole?>"!="1" && "<?=$isxfyyerole?>"!="1"){
+                    } else if (calEvent.className[0] == 'label-purple') {
+                        if ("<?=$isxfvrole?>" != "1" && "<?=$isxfyyerole?>" != "1" && "<?=$canEdit?>" != "1") {
                             return
-                        }else{
+                        } else {
-                            $('#uploader').attr('action','./?app=uploader&id='+ calEvent.id +'&bumen=chanpin&act=add');
+                            $('#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_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')
+                            $("#uploader_yf").attr('action', './?app=uploader&id=' + calEvent.id + '&bumen=yanfa&act=add')
 
                             //console.log($('#uploader').attr('action')) 
 
@@ -1149,36 +1254,34 @@ if ($act == 'newevent') {
                             });
                             dstr = $.fullCalendar.formatDate(calEvent.start, 'yyyy-MM-dd');
                             showEventData(calEvent.id);
-                        };
+                        }
-                    }else{
+                        ;
+                    } else {
                         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')
 
-                $('#uploader').attr('action','./?app=uploader&id='+ calEvent.id +'&bumen=chanpin&act=add');
+                    // //console.log($('#uploader').attr('action'))
-                $('#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')
-
-                   //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);
 
+                    // 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);
+                // }
 
             }
 
@@ -1191,7 +1294,9 @@ if ($act == 'newevent') {
         if (dis == 'none') {
             $('#data_box').show();
             $('#calendardiv').hide();
-
+            
+            $('#datarepairname').html('返回Event');
+            $("#dataimg").attr("src",'assets/images/fanhui.png');
             var time = (Math.round(starttime.getTime()) + Math.round(endtime.getTime())) / 2;
             time = new Date(time);
             var year = time.getFullYear() + '年';
@@ -1220,9 +1325,18 @@ if ($act == 'newevent') {
                                 color: '#6fb3e0',
                             }
                         },
+                        color: ['#ff7f7f', '#a494f9'],
                         toolbox: {
+                            show: true,
+                            orient: 'vertical',
+                            left: 'right',
+                            top: 'center',
                             feature: {
-                                saveAsImage: {}
+                                mark: {show: true},
+                                dataView: {show: true, readOnly: false},
+                                magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
+                                restore: {show: true},
+                                saveAsImage: {show: true}
                             }
                         },
                         legend: {
@@ -1230,9 +1344,10 @@ if ($act == 'newevent') {
                         },
                         tooltip: {},
                         grid: {
-                            left: '0',
+                            left: '3%',
-                            right: '0',
+                            right: '3%',
                             bottom: '5%',
+                            // top: '0%',
                             containLabel: true
                         },
                         color: ['#ff7f7f', '#a494f9'],
@@ -1259,8 +1374,13 @@ if ($act == 'newevent') {
                                 itemStyle: {
                                     normal: {
                                         label: {
-                                            show: true, //开启显示
+                                            show: true,
-                                            position: 'top', //在上方显示
+                                            position: 'insideBottom',
+                                            distance: 15,
+                                            align: 'left',
+                                            verticalAlign: 'middle',
+                                            rotate: 90,
+                                            fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',
                                                 fontSize: 13
@@ -1274,8 +1394,13 @@ if ($act == 'newevent') {
                                 itemStyle: {
                                     normal: {
                                         label: {
-                                            show: true, //开启显示
+                                            show: true,
-                                            position: 'top', //在上方显示
+                                            position: 'insideBottom',
+                                            distance: 15,
+                                            align: 'left',
+                                            verticalAlign: 'middle',
+                                            rotate: 90,
+                                            fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',
                                                 fontSize: 13
@@ -1306,6 +1431,11 @@ if ($act == 'newevent') {
 
         } else {
             $('#data_box').hide();
+            $('#datarepairname').html('查看统计');
+
+            // <img src='assets/images/tongji.png' id="dataimg"/>
+            $("#dataimg").attr("src",'assets/images/tongji.png');
+
             $('#calendardiv').show();
         }
 
@@ -1318,40 +1448,47 @@ if ($act == 'newevent') {
         $.ajax({
             url: './?app=pmcalendar&act=getEventByid',
             dataType: 'json',
-            async:"true",
+            async: "true",
             data: {
                 id: id,
             },
             success: function (res) {
-                $('#pop-title').html('【'+ res.game +'】'+ res.event + ':' + res.title );
+                $('#pop-title').html('【' + res.game + '】' + res.event + ':' + res.title);
                 // $("#cptext").val(res.yanfa_remark)
+                // res.chanpin_remark = res.chanpin_remark.replace('\\','')
                 console.log(res.chanpin_remark)
-                var chanpin_remark =JSON.parse(res.chanpin_remark)
+                if (res.chanpin_remark != "" && res.chanpin_remark != null) {
-                var yunying_remark = JSON.parse(res.yunying_remark);
+                    var chanpin_remark = JSON.parse(res.chanpin_remark)
-                var yanfa_remark = JSON.parse(res.yanfa_remark);
+                    document.getElementById("cptext").innerHTML = chanpin_remark.msg;
-                document.getElementById("cptext").innerHTML = chanpin_remark.msg;
+                    document.getElementById("cptime").innerHTML = chanpin_remark.date;
-                document.getElementById("yytext").innerHTML = yunying_remark.msg;
+                }
-                document.getElementById("yftext").innerHTML = yanfa_remark.msg;
+                if (res.yunying_remark != "" && res.yunying_remark != null) {
-                document.getElementById("cptime").innerHTML = chanpin_remark.date;
+                    var yunying_remark = JSON.parse(res.yunying_remark);
-                document.getElementById("yytime").innerHTML = chanpin_remark.date;
+                    document.getElementById("yytext").innerHTML = yunying_remark.msg;
-                document.getElementById("yftime").innerHTML = chanpin_remark.date;
+                    document.getElementById("yytime").innerHTML = yunying_remark.date;
+                }
+                if (res.yanfa_remark != "" && res.yanfa_remark != null) {
+                    var yanfa_remark = JSON.parse(res.yanfa_remark);
+                    document.getElementById("yftext").innerHTML = yanfa_remark.msg;
+                    document.getElementById("yftime").innerHTML = yanfa_remark.date;
+                }
 
-                var fujian = JSON.parse(res.fujian); 
+                var fujian = JSON.parse(res.fujian);
-                // console.log(fujian);
+                console.log(fujian);
                 var arrcp = [];
                 var arryy = [];
                 var arryf = [];
-                for(let i in fujian ){
+                for (let i in fujian) {
-                    if(fujian[i]['bumen'] == 'chanpin'){
+                    if (fujian[i]['bumen'] == 'chanpin') {
                         arrcp.push(fujian[i])
                         console.log(arrcp);
                         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
                         document.getElementById("fujianname").innerHTML = tmpltxt(arrcp);//数据渲染
-                    }else if(fujian[i]['bumen'] == 'yunyig'){
+                    } else if (fujian[i]['bumen'] == 'yunyig') {
                         arryy.push(fujian[i])
                         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
                         document.getElementById("yyfujian").innerHTML = tmpltxt(arryy);//数据渲染
-                    }else if(fujian[i]['bumen'] == 'yanfa'){
+                    } else if (fujian[i]['bumen'] == 'yanfa') {
                         arryf.push(fujian[i])
                         tmpltxt = doT.template(document.getElementById("fujian-dot").innerHTML);//生成模板方法
                         document.getElementById("yffujian").innerHTML = tmpltxt(arryf);//数据渲染
@@ -1370,7 +1507,7 @@ if ($act == 'newevent') {
     })
 
     function Info() {
-        if("<?=$canEdit?>"!="1")return;
+        if ("<?=$canEdit?>" != "1") return;
         showEventInfo(dstr, {
             "save": {
                 "label": "<i class='icon-check'></i> 保存",

uploader.php

@@ -4,6 +4,7 @@ $fileData = array();
 $cardId = r('id');
 $act = r('act');
 if ($act == 'add') {
+    print_r($fujian);
     foreach ($fujian['name'] as $idx => $data) {
         if ($fujian['error'][$idx] == 0) {
             $id = uniqid() . $idx;
@@ -18,7 +19,7 @@ if ($act == 'add') {
                 "bumen" => r('bumen'),
                 "file" => $newName
             );
-            rename($fujian['tmp_name'][$idx], $newName);
+            rename($fujian['tmp_name'][$idx], '.'.$newName);
 
         }
     }