Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/images/dabao.png
#	assets/images/gengxin.png
#	assets/images/jeidian.png
#	assets/images/xiufu.png
#	config.json
#	pmcalendar.php

assets/css/fullcalendar.css

@@ -36,17 +36,32 @@ html .fc,
 	}
 
 .fc-header-left {
-	width: 25%;
-	text-align: left;
+	width: 415px;
+    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;
+    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 {
@@ -61,6 +76,7 @@ html .fc,
 	
 .fc .fc-header-space {
     padding-left: 10px;
+    display: none;
 	}
 	
 .fc-header .fc-button {
@@ -103,6 +119,7 @@ html .fc,
 .fc-content {
 	clear: both;
     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;
@@ -247,6 +265,7 @@ html .fc,
 	opacity: 0.65;
 	filter: alpha(opacity=65);
     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;
-	padding: 5px;
-	margin: 5px 12px 0 12px;
+	border-radius: 0px !important;
+	padding: 10px 5px 10px 15px;
+	margin: 10px 12px 0px 12px;
     cursor:pointer;
+    font-weight: bold;
 	}
 
 	@media only screen and (max-width:360px) {
@@ -405,6 +425,7 @@ table.fc-border-separate {
 .fc-border-separate tbody tr.fc-first td,
 .fc-border-separate tbody tr.fc-first th {
     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"],"gxvroles":["aaaaa","555"],"gxyyeroles":["\u5434\u660a"],"gxcperoles":["\u5434\u660a"],"gxyferoles":["\u5434\u660a"],"xfvroles":["\u5434\u660a"],"xfyyeroles":["\u5434\u660a"]}
+{"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

@@ -299,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>
@@ -316,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: 90px;
-                        color: #6fb3e0;
+                        top: 60px;
+                        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;
-                        height: 20px;
+                        width: 16px;
+                        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 {
@@ -398,30 +413,33 @@ if ($act == 'newevent') {
                     }
 
                     .data_tab {
-                        width: 240px;
+                        width: 325px;
                         display: flex;
                         justify-content: space-between;
                         align-items: center;
                         position: relative;
-                        top: 40px;
+                        top: 18px;
+                        right: 11px;
                         z-index: 1000;
                         float: right;
                     }
 
                     .data-box {
-                        width: 50px;
+                        width: 80px;
                         text-align: center;
+                        display: flex;
+                        align-items: center;
                     }
 
                     .data-box img {
-                        width: 28px;
-                        height: 28px;
-                        margin: 0 auto;
+                        width: 24px;
+                        /* margin: 0 auto; */
+                        margin-right: 5px
                     }
 
                     .data-box .data-name {
-                        font-size: 15px;
-                        color: #5fadff;
+                        font-size: 12px;
+                        color: #8e8e8e;
                         text-align: center;
                     }
 
@@ -430,32 +448,38 @@ if ($act == 'newevent') {
                         color: #a0a0a0;
                         text-align: center;
                     }
+                    .formtab {
+                        padding: 27px 0px !important;
+                        color:#474747 !important;
+                        border: 0px !important;
+                        text-align: center;
+                    }
                 </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-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-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-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-name">节点</p>
                         <p class="data-num" id="jeidiannum"></p>
                     </div>
                 </div>
@@ -463,8 +487,8 @@ if ($act == 'newevent') {
 
                     <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">
+                    <div class="card-body" style="margin: 0 2% 0 3%;">
+                        <table class="table table-bordered table-striped" style='border:1px solid #f0f0f0 !important; text-align:center;'>
                             <thead id="thead-title" class="thead" ></thead>
                             <tbody id="tbody-content"></tbody>
                         </table>
@@ -607,7 +631,10 @@ if ($act == 'newevent') {
     .tianjia {
         width: 15px;
         height: 15px;
-        margin-right: 15px;
+        margin-right: 0px;
+        position: absolute;
+        top: 10px;
+        right: 0;
     }
 
     .fujian-box {
@@ -647,6 +674,11 @@ if ($act == 'newevent') {
         border-radius: 4px;
         float: right;
         cursor: pointer;
+        margin-top: 25px;
+    }
+    .upfujian {
+        width: 100%;
+        margin: 0 20px;
     }
 </style>
 <div class='popup-bg' id='popup-bg'>
@@ -673,12 +705,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">
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>"/>
+                            <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()">
+                                   onchange="document.getElementById('uploader').submit()"  style='opacity: 0; position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="cptijiao">提交</div>
 
@@ -710,12 +743,13 @@ 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">
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>"/>
+                            <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()">
+                                   onchange="document.getElementById('uploader_yy').submit()" style='opacity: 0;position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="yytijiao">提交</div>
                     </div>
@@ -742,12 +776,13 @@ if ($act == 'newevent') {
                 <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">
-                            <input name="cid" type="hidden" value="<%=DATA.lastShowCardID%>"/>
+                            <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()">
+                                   onchange="document.getElementById('uploader_yf').submit()" style='opacity: 0; position: absolute;z-index: 1001;'>
                         </form>
                         <div class='tijiao' id="yftijiao">提交</div>
                     </div>
@@ -770,10 +805,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>
@@ -782,9 +817,23 @@ if ($act == 'newevent') {
 <script type="text/x-dot-template" id="tbody-dot">
     {{ for(var i in it) { }}
     <tr>
+        {{? i != 1}}
             {{ for(var k in it[i]) { }}
-        <td>{{= it[i][k]}}</td>
+                {{? k !=1}}
+                    <td style="border-top: 1px solid #f0f0f0; color:#474747; padding: 25px 0; background-color:#fff; border-bottom:0px; border-left:0px; border-right:0px; ">{{= it[i][k]}}</td>
+                {{??}}
+                    <td style="border-top: 1px solid #f0f0f0; color:#474747; padding: 25px 0; background-color:#fff; border-bottom:0px; border-left:0px; border-right:0px; color:#007efa !important;">{{= it[i][k]}}</td>
+                {{?}}
             {{ } }}
+        {{??}}
+            {{ for(var k in it[i]) { }}
+                {{? k !=1}}
+                    <td style="border-top: 1px solid #f0f0f0; color:#474747; padding: 25px 0; background-color:#fafafa; border-bottom:0px; border-left:0px; border-right:0px; ">{{= it[i][k]}}</td>
+                {{??}}
+                    <td style="border-top: 1px solid #f0f0f0; color:#474747; padding: 25px 0; background-color:#fafafa; border-bottom:0px; border-left:0px; border-right:0px; color:#007efa !important;">{{= it[i][k]}}</td>
+                {{?}}
+            {{ } }}
+        {{?}}
     </tr>
     {{ } }}
 </script>
@@ -889,10 +938,12 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
     })
@@ -919,10 +970,12 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
     })
@@ -949,10 +1002,12 @@ if ($act == 'newevent') {
             },
             success: function (res) {
                 console.log(res);
-                alert('提交成功')
+                alert('提交成功');
+                showEventData(notid);
             },
             error: function () {
-                alert('数据异常,请稍后重试!!!')
+                alert('数据异常,请稍后重试!!!');
+                showEventData(notid);
             }
         });
     })
@@ -971,8 +1026,8 @@ if ($act == 'newevent') {
                 $("#upfujian_yy").hide();
                 i = 0;
             }
-        }
-        ;
+        };
+        console.log("<?=$isgxcperole?>")
         if ("<?=$isgxcperole?>" == "1") {
             if (i == 0) {
                 $('#cptext').attr('disabled', false)
@@ -983,9 +1038,7 @@ if ($act == 'newevent') {
                 $("#upfujian_cp").hide();
                 i = 0;
             }
-        }
-        ;
-        console.log("<?=$isgxyferole?>")
+        };
         if ("<?=$isgxyferole?>" == "1") {
             if (i == 0) {
                 $('#yftext').attr('disabled', false)
@@ -997,8 +1050,7 @@ if ($act == 'newevent') {
                 $("#upfujian_yf").hide();
                 i = 0;
             }
-        }
-        ;
+        };
 
         if ("<?=$isxfyyerole?>" == "1") {
             if (i == 0) {
@@ -1010,46 +1062,7 @@ if ($act == 'newevent') {
                 $("#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) {
@@ -1085,7 +1098,7 @@ if ($act == 'newevent') {
                 next: '<i class="icon-chevron-right"></i>',
                 prevYear: '去年',
                 nextYear: '明年',
-                today: '今天',
+                today: '',
                 month: '月',
                 week: '周',
                 day: '日'
@@ -1119,11 +1132,11 @@ if ($act == 'newevent') {
                         console.log(doc);
                         callback(doc.calendarData);
                         // console.log(doc);\
-                        $("#dabaonum").html(doc.count['打包']);
-                        $("#gengxinnum").html(doc.count['版本更新']);
-                        $("#xiufunum").html(doc.count['修复外网']);
-                        $("#jeidiannum").html(doc.count['节点']);
-
+                        $("#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++) {
@@ -1297,6 +1310,8 @@ if ($act == 'newevent') {
             $('#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() + '年';
@@ -1325,35 +1340,67 @@ if ($act == 'newevent') {
                                 color: '#6fb3e0',
                             }
                         },
+                        color: ['#ff7f7f', '#a494f9'],
                         toolbox: {
+                            show: true,
+                            orient: 'vertical',
+                            right: '1.5%',
+                            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: {
-                            left: 10
+                            left: '3%',
+                            itemHeight: 11,
+                            itemWidth: 6,
+                            color:"#5f5f5f"
                         },
                         tooltip: {},
                         grid: {
-                            left: '0',
-                            right: '0',
+                            left: '3%',
+                            right: '3%',
                             bottom: '5%',
+                            // top: '0%',
                             containLabel: true
                         },
                         color: ['#ff7f7f', '#a494f9'],
                         dataset: {
                             source: chartsdata
                         },
-                        xAxis: {type: 'category'},
+                        xAxis: {
+                            type: 'category',
+                            axisLabel:{
+                                show: true,
+                                textStyle:{
+                                    color:"#bfbfbf"
+                                }
+                            },
+                            axisLine:{
+                                lineStyle:{
+                                    color:'#bfbfbf',
+                               }
+                            }
+                        },
                         yAxis: {
+                            axisLabel:{
+                                textStyle:{
+                                    color:"#bfbfbf"
+                                }
+                            },
                             "axisLine": {       //y轴
-                                "show": true
+                                "show": false
                             },
                             "axisTick": {       //y轴刻度线
-                                "show": true
+                                "show": false
                             },
                             "splitLine": {     //网格线
-                                "show": false
+                                "show": true,
+                                'coloe': '#bfbfbf'
                             }
                         },
                         // Declare several bar series, each will be mapped
@@ -1361,11 +1408,17 @@ if ($act == 'newevent') {
                         series: [
                             {
                                 type: 'bar',
+                                barCategoryGap : 60,
                                 itemStyle: {
                                     normal: {
                                         label: {
-                                            show: true, //开启显示
-                                            position: 'top', //在上方显示
+                                            show: true,
+                                            position: 'insideBottom',
+                                            distance: 15,
+                                            align: 'left',
+                                            verticalAlign: 'middle',
+                                            rotate: 1,
+                                            fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',
                                                 fontSize: 13
@@ -1376,11 +1429,17 @@ if ($act == 'newevent') {
                             },
                             {
                                 type: 'bar',
+                                barCategoryGap : 60,
                                 itemStyle: {
                                     normal: {
                                         label: {
-                                            show: true, //开启显示
-                                            position: 'top', //在上方显示
+                                            show: true,
+                                            position: 'insideBottom',
+                                            distance: 15,
+                                            align: 'left',
+                                            verticalAlign: 'middle',
+                                            rotate: 1,
+                                            fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',
                                                 fontSize: 13
@@ -1411,6 +1470,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();
         }
 
@@ -1440,16 +1504,16 @@ if ($act == 'newevent') {
                 if (res.yunying_remark != "" && res.yunying_remark != null) {
                     var yunying_remark = JSON.parse(res.yunying_remark);
                     document.getElementById("yytext").innerHTML = yunying_remark.msg;
-                    document.getElementById("yytime").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 = chanpin_remark.date;
+                    document.getElementById("yftime").innerHTML = yanfa_remark.date;
                 }
 
                 var fujian = JSON.parse(res.fujian);
-                // console.log(fujian);
+                console.log(fujian);
                 var arrcp = [];
                 var arryy = [];
                 var arryf = [];