Home Explore Help
Register Sign In
puti
/
snd-escloud
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改 字段添加

huZhiHao 5 years ago
parent
a248f62a26
commit
062890f4e8
2 changed files with 64 additions and 31 deletions
Split View Show Diff Stats
  1. 39 11
      src/main/resources/templates/admin/government/land_statistic/plate.html
  2. 25 20
      src/main/resources/templates/admin/government/land_statistic/region.html

+ 39 - 11
src/main/resources/templates/admin/government/land_statistic/plate.html
View File 

@@ -173,6 +173,9 @@
 
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
 
         }
 
 
+        .chartContent{
 
+            border-bottom: 1px solid #ded7d5;
 
+        }
 
     </style>
 
 </head>
 
 <body layout:fragment="content">
 
@@ -497,6 +500,9 @@
 
                     data: xAxisData,
 
                     axisTick: {
 
                         alignWithLabel: true
 
+                    },
 
+                    axisLabel: {
 
+                        interval: 0
 
                     }
 
                 }
 
             ],
 
@@ -507,7 +513,7 @@
 
             ],
 
             series: [
 
                 {
 
-                    name: '直接访问',
 
+                    name: '',
 
                     type: 'bar',
 
                     barWidth: '60%',
 
                     label: {
 
@@ -559,13 +565,14 @@
 
                             show: true,
 
                             zlevel: 0,
 
                             position: 'top',
 
-                            formatter: function () {
 
-                                var num = 0;
 
-                                for (var obj of data) {
 
-                                    num += obj.value;
 
-                                }
 
-                                return num;
 
-                            }
 
+                            formatter: '{b}: {c}'
 
+                            // formatter: function () {
 
+                            //     var num = 0;
 
+                            //     for (var obj of data) {
 
+                            //         num += obj.value;
 
+                            //     }
 
+                            //     return num;
 
+                            // }
 
                         },
 
                         emphasis: {
 
                             show: false,
 
@@ -738,15 +745,36 @@
 
         /*时间初始化*/
 
         function fun_date(num) {
 
             num = num + 1
 
+            //num是正数表示之后的时间，num负数表示之前的时间，0表示今天
 
             var date1 = new Date();
 
             //今天时间
 
-            var time1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate()
 
+            var year1, month1, day1;
 
+            year1 = date1.getFullYear();
 
+            month1 = (date1.getMonth() + 1);
 
+            day1 = date1.getDate();
 
+            if (month1 < 10) {
 
+                month1 = "0" + month1;
 
+            }
 
+            if (day1 < 10) {
 
+                day1 = "0" + day1;
 
+            }
 
+            var time1 = year1 + "-" + month1 + "-" + day1;
 
             // console.log(time1);
 
             endTime = time1;
 
             var date2 = new Date(date1);
 
             date2.setDate(date1.getDate() + num);
 
-            //num是正数表示之后的时间，num负数表示之前的时间，0表示今天
 
-            var time2 = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + date2.getDate();
 
+
 
+            var year2, month2, day2;
 
+            year2 = date2.getFullYear();
 
+            month2 = (date2.getMonth() + 1);
 
+            day2 = date2.getDate();
 
+            if (month2 < 10) {
 
+                month2 = "0" + month2;
 
+            }
 
+            if (day2 < 10) {
 
+                day2 = "0" + day2;
 
+            }
 
+            var time2 = year2 + "-" + month2 + "-" + day2;
 
             // console.log(time2);
 
             startTime = time2;

+ 25 - 20
src/main/resources/templates/admin/government/land_statistic/region.html
View File 

@@ -181,6 +181,10 @@
 
         .clearfix {
 
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
 
         }
 
+
 
+        .chartContent{
 
+            border-bottom: 1px solid #ded7d5;
 
+        }
 
     </style>
 
     <link rel="stylesheet" th:href="@{/home/ifont/iconfont.css}">
 
 </head>
 
@@ -209,19 +213,19 @@
 
         <i class="pre_month Hui-iconfont Hui-iconfont-slider-left"></i>
 
         <i class="next_month Hui-iconfont Hui-iconfont-slider-right"></i>
 
         <ul class="date_tab_list clearfix" id="date_line">
 
-<!--            <li class="date_tab_item">2019-01</li>-->
 
-<!--            <li class="date_tab_item">2019-02</li>-->
 
-<!--            <li class="date_tab_item">2019-03</li>-->
 
-<!--            <li class="date_tab_item">2019-04</li>-->
 
-<!--            <li class="active_month date_tab_item">2019-05</li>-->
 
-<!--            <li class="date_tab_item">2019-06</li>-->
 
-<!--            <li class="date_tab_item">2019-07</li>-->
 
-<!--            <li class="date_tab_item">2019-08</li>-->
 
-<!--            <li class="date_tab_item">2019-09</li>-->
 
-<!--            <li class="date_tab_item">2019-11</li>-->
 
-<!--            <li class="date_tab_item">2019-12</li>-->
 
-<!--            <li class="date_tab_item">2020-01</li>-->
 
-<!--            <li class="date_tab_item">2020-02</li>-->
 
+            <!--            <li class="date_tab_item">2019-01</li>-->
 
+            <!--            <li class="date_tab_item">2019-02</li>-->
 
+            <!--            <li class="date_tab_item">2019-03</li>-->
 
+            <!--            <li class="date_tab_item">2019-04</li>-->
 
+            <!--            <li class="active_month date_tab_item">2019-05</li>-->
 
+            <!--            <li class="date_tab_item">2019-06</li>-->
 
+            <!--            <li class="date_tab_item">2019-07</li>-->
 
+            <!--            <li class="date_tab_item">2019-08</li>-->
 
+            <!--            <li class="date_tab_item">2019-09</li>-->
 
+            <!--            <li class="date_tab_item">2019-11</li>-->
 
+            <!--            <li class="date_tab_item">2019-12</li>-->
 
+            <!--            <li class="date_tab_item">2020-01</li>-->
 
+            <!--            <li class="date_tab_item">2020-02</li>-->
 
         </ul>
 
     </div>
 
     <div id="monthly_type_bar" style="width: 1200px; height: 400px"></div>
 
@@ -617,13 +621,14 @@
 
                             show: true,
 
                             zlevel: 0,
 
                             position: 'top',
 
-                            formatter: function () {
 
-                                var num = 0;
 
-                                for (var obj of data) {
 
-                                    num += obj.value;
 
-                                }
 
-                                return num;
 
-                            }
 
+                            formatter: '{b}: {c}'
 
+                            // formatter: function () {
 
+                            //     var num = 0;
 
+                            //     for (var obj of data) {
 
+                            //         num += obj.value;
 
+                            //     }
 
+                            //     return num;
 
+                            // }
 
                         },
 
                         emphasis: {
 
                             show: false,