Merge remote-tracking branch 'origin2/dev' into origin2-dev

# Conflicts:
#	src/main/resources/templates/admin/government/land_statistic/plate.html
#	src/main/resources/templates/admin/government/land_statistic/region.html

src/main/resources/templates/admin/government/land_statistic/plate.html

@@ -173,7 +173,9 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent {
+        .chartContent{
+            padding-left: 20px;
+            padding-right: 20px;
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -213,7 +215,6 @@
     <span class="date_tab_item" data-type="-7">7天</span>
     <span class="date_tab_item" data-type="-14">14天</span>
     <span class="date_tab_item" style="border-right: 1px solid #e2e3e3;" data-type="-30">30天</span>
-    <input type="text" name="starttime" class="form-control" id="starttime">
 </div>
 <div class="chartContent">
     <div class="title">每日统计</div>
@@ -510,7 +511,7 @@
                 {
                     name: '',
                     type: 'bar',
-                    barWidth: '60%',
+                    barWidth: '40%',
                     label: {
                         normal: {
                             show: true,

src/main/resources/templates/admin/government/land_statistic/region.html

@@ -182,7 +182,9 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent {
+        .chartContent{
+            padding-left: 20px;
+            padding-right: 20px;
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -539,6 +541,7 @@
                     fontWeight: 'bold'
                 }
             },
+            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -572,7 +575,7 @@
                 {
                     name: '',
                     type: 'bar',
-                    barWidth: '60%',
+                    barWidth: '40%',
                     label: {
                         normal: {
                             show: true,
@@ -849,6 +852,8 @@
                 getTypeStatistic("", startTime, endTime);
             }
         }
+        let initOffset = (0 - (Math.ceil(dataArr.length / 9) - 1) * 1170)
+        $('.date_tab_list').css('left', initOffset)
         $("#date_line").append(str);
 
         // 点击前一页