From fe012b3ad47438c59f8c8851f02f5ffb7b290343 Mon Sep 17 00:00:00 2001
From: wuhao <15392746632@qq.com>
Date: Tue, 8 Dec 2020 13:44:08 +0800
Subject: [PATCH] update

---
 pmcalendar.php | 65 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 13 deletions(-)

diff --git a/pmcalendar.php b/pmcalendar.php
index e42de9a..6471ad3 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -452,6 +452,7 @@ if ($act == 'newevent') {
                         padding: 27px 0px !important;
                         color:#474747 !important;
                         border: 0px !important;
+                        text-align: center;
                     }
                 </style>
                 <div class='datarepair' id="datarepair" onclick="datarepair()">
@@ -486,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" style='border:0px !important'>
+                    <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>
@@ -816,9 +817,23 @@ if ($act == 'newevent') {
 <script type="text/x-dot-template" id="tbody-dot">
     {{ for(var i in it) { }}
     <tr>
-        {{ for(var k in it[i]) { }}
-        <td>{{= it[i][k]}}</td>
-        {{ } }}
+        {{? i != 1}}
+            {{ for(var k in it[i]) { }}
+                {{? 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>
@@ -1329,7 +1344,7 @@ if ($act == 'newevent') {
                         toolbox: {
                             show: true,
                             orient: 'vertical',
-                            left: 'right',
+                            right: '1.5%',
                             top: 'center',
                             feature: {
                                 mark: {show: true},
@@ -1340,7 +1355,10 @@ if ($act == 'newevent') {
                             }
                         },
                         legend: {
-                            left: 10
+                            left: '3%',
+                            itemHeight: 11,
+                            itemWidth: 6,
+                            color:"#5f5f5f"
                         },
                         tooltip: {},
                         grid: {
@@ -1354,16 +1372,35 @@ if ($act == 'newevent') {
                         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
@@ -1371,6 +1408,7 @@ if ($act == 'newevent') {
                         series: [
                             {
                                 type: 'bar',
+                                barCategoryGap : 60,
                                 itemStyle: {
                                     normal: {
                                         label: {
@@ -1379,7 +1417,7 @@ if ($act == 'newevent') {
                                             distance: 15,
                                             align: 'left',
                                             verticalAlign: 'middle',
-                                            rotate: 90,
+                                            rotate: 1,
                                             fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',
@@ -1391,6 +1429,7 @@ if ($act == 'newevent') {
                             },
                             {
                                 type: 'bar',
+                                barCategoryGap : 60,
                                 itemStyle: {
                                     normal: {
                                         label: {
@@ -1399,7 +1438,7 @@ if ($act == 'newevent') {
                                             distance: 15,
                                             align: 'left',
                                             verticalAlign: 'middle',
-                                            rotate: 90,
+                                            rotate: 1,
                                             fontSize: 16,
                                             textStyle: { //数值样式
                                                 color: '#000',