一些样式修改

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

@@ -25,7 +25,7 @@
 
         .chartContent .chartLi {
             float: left;
-            height: 300px;
+            height: 200px;
             box-sizing: border-box;
         }
 
@@ -173,7 +173,9 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent {
+        .chartContent{
+            padding-left: 20px;
+            padding-right: 20px;
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -200,6 +202,9 @@
     <!--    <span class="plate_tab_item">综合保税区</span>-->
     <!--    <span class="plate_tab_item">度假区(含镇湖)</span>-->
     <!--    <span class="plate_tab_item">区外</span>-->
+</div>
+<div class="chartContent">
+
 </div>
 <div class="chartContent">
     <div class="title">当前审核状态统计</div>
@@ -213,7 +218,9 @@
     <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>
 <div class="chartContent">
     <div class="title">每日统计</div>
@@ -403,7 +410,6 @@
 
         // 指定图表的配置项和数据
         var option = {
-            color: ['#61A5E8', '#EECB5F'],
             title: {
                 text: title,
                 textStyle: {
@@ -421,6 +427,7 @@
                 bottom: 10,
                 data: legendData
             },
+            color: ['#61A5E8','#EECB5F'],
             series: [
                 {
                     name: title,
@@ -469,7 +476,6 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#61A5E8'],
             title: {
                 text: title,
                 textStyle: {
@@ -477,6 +483,7 @@
                     fontWeight: 'bold'
                 }
             },
+            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -510,7 +517,7 @@
                 {
                     name: '',
                     type: 'bar',
-                    barWidth: '60%',
+                    barWidth: '40%',
                     label: {
                         normal: {
                             show: true,
@@ -532,7 +539,6 @@
 
         // 指定图表的配置项和数据
         var option = {
-            color: ['#7ECF51', '#B9646E', '#E3935D'],
             title: {
                 text: title,
                 textStyle: {
@@ -550,6 +556,7 @@
                 bottom: 10,
                 data: legendData
             },
+            color: ['#7ECF51', '#B9646E', '#E3935D'],
             series: [
                 {
                     name: title,
@@ -599,7 +606,6 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#61A5E8', '#7ECF51', '#B9464E', '#E3935D'],
             // title: {
             //     text: '折线图堆叠'
             // },
@@ -609,6 +615,7 @@
             legend: {
                 data: legendData
             },
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9646E'],
             grid: {
                 left: '3%',
                 right: '4%',
@@ -641,7 +648,7 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9464E'],
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9646E'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {

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

@@ -24,7 +24,7 @@
 
         .chartContent .chartLi {
             float: left;
-            height: 300px;
+            height: 200px;
             box-sizing: border-box;
         }
 
@@ -182,7 +182,9 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent {
+        .chartContent{
+            padding-left: 20px;
+            padding-right: 20px;
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -285,7 +287,7 @@
                 <td th:text="*{useChangePassRate + '%'}"></td>
                 <td th:text="*{immovablesChangeApplyNum}"></td>
                 <td th:text="*{immovablesChangePassNum}"></td>
-                <td th:text="*{immovablesChangePassRate}"></td>
+                <td th:text="*{immovablesChangePassRate + '%'}"></td>
                 <td th:text="*{equityStructureChangeApplyNum}"></td>
                 <td th:text="*{equityStructureChangePassNum}"></td>
                 <td th:text="*{equityStructureChangePassRate}"></td>
@@ -465,7 +467,6 @@
 
         // 指定图表的配置项和数据
         var option = {
-            color: ['#61A5E8', '#EECB5F'],
             title: {
                 text: title,
                 textStyle: {
@@ -483,6 +484,7 @@
                 bottom: 10,
                 data: legendData
             },
+            color: ['#61A5E8','#EECB5F'],
             series: [
                 {
                     name: title,
@@ -531,7 +533,6 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#61A5E8'],
             title: {
                 text: title,
                 textStyle: {
@@ -539,6 +540,7 @@
                     fontWeight: 'bold'
                 }
             },
+            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -572,7 +574,7 @@
                 {
                     name: '',
                     type: 'bar',
-                    barWidth: '60%',
+                    barWidth: '40%',
                     label: {
                         normal: {
                             show: true,
@@ -594,7 +596,6 @@
 
         // 指定图表的配置项和数据
         var option = {
-            color: ['#7ECF51', '#B9646E', '#E3935D'],
             title: {
                 text: title,
                 textStyle: {
@@ -612,6 +613,7 @@
                 bottom: 10,
                 data: legendData
             },
+            color: ['#7ECF51', '#B9646E', '#E3935D'],
             series: [
                 {
                     name: title,
@@ -690,7 +692,7 @@
             //     currentIndex: 11,
             //     data: getMonth()
             // },
-            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9464E'],
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9646E'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {
@@ -746,7 +748,7 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#7ECF51', '#B9464E', '#E3935D'],
+            color: ['#7ECF51', '#B9646E', '#EECB5F'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -792,14 +794,6 @@
         $('#monthly_approve_statistic').load(url);
     }
 
-    //板块统计表
-    function getPlateStatistic() {
-        var start_time = $('#plate_start_time').val();
-        var end_time = $('#plate_end_time').val();
-        // 装载局部刷新返回的页面
-        $('#plate_approve_statistic').load(pagePath + "/land_statistic/approve/statistic/plate?start_time=" + start_time + "&end_time=" + end_time);
-    }
-
     //导出月度统计
     function exportMonthlyStatistic() {
         var start_time = $('#monthly_start_time').val();
@@ -814,6 +808,14 @@
         window.open(pagePath + "/land_statistic/approve/statistic/plate/export?start_time=" + start_time + "&end_time=" + end_time);
     }
 
+    //板块统计表
+    function getPlateStatistic() {
+        var start_time = $('#plate_start_time').val();
+        var end_time = $('#plate_end_time').val();
+        // 装载局部刷新返回的页面
+        $('#plate_approve_statistic').load(pagePath + "/land_statistic/approve/statistic/plate?start_time=" + start_time + "&end_time=" + end_time);
+    }
+
     $(document).on("click", ".liHead", function () {
         // console.log("点击了", $(this).next().is(":hidden"))
         if (!$(this).next().is(":hidden")) {
@@ -849,6 +851,8 @@
                 getTypeStatistic("", startTime, endTime);
             }
         }
+        let initOffset = (0 - (Math.ceil(dataArr.length / 9) - 1) * 1170)
+        $('.date_tab_list').css('left', initOffset)
         $("#date_line").append(str);
 
         // 点击前一页