bug fixed

src/assets/css/element_ui.css

@@ -434,3 +434,7 @@ cur-select {
 .el-date-editor .el-range-input, .el-tabs__item, .el-select-dropdown__item {
   font-size: 0.625vw;
 }
+
+.el-date-editor .el-range__icon {
+  line-height: 24px;
+}

src/components/barChart.vue

@@ -212,7 +212,7 @@ export default {
   }
   .bar-tooltip {
     padding: 10px 20px;
-    font-size: 16px;
+    font-size: 12px;
     background: url("../../static/img/u231.png");
     background-size: 100% 100%;
   }

src/components/pieChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-const colors = ["#db6749", "#f8cd55", "#3c97d6", "#989bf8"];
+const colors = ["#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de", "#3ba272", "#fc8452", "#9a60b4", "#ea7ccc"];
 import * as echarts from 'echarts'
 export default {
   props: {

src/pages/index/components/berths_revenue.vue

@@ -35,11 +35,11 @@
         <el-button type="primary" @click="queryAll">查询</el-button>
       </el-form-item>
     </el-form>
-    <div style="width: 100%;">
-      <div style="width: 100%;height: 400px;">
+    <div style="width: 100%; display: flex; flex-wrap: wrap;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">按小时统计</h5>
-        <br>
-        <linechart
+        <div style="width: 100%;height: 200px;">
+          <linechart
           :autoStop="false"
           :top="30"
           :bottom="30"
@@ -52,91 +52,85 @@
               { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
             ]"
           id="axstj"
-        />
+          />
+        </div>
       </div>
-      <br>
-      <br>
-      <br>
-      <div style="width: 100%;height: 400px;">
-        <h5 style="color: white">按日统计</h5>
-        <br>
-        <linechart
-          :autoStop="false"
-          :top="30"
-          :bottom="30"
-          :left="40"
-          :legendTop="0"
-          yAxisName="(元)"
-          :dataset="linedata2"
-          :tooltipFormat="lineTooltipFormat"
-          :encode="[
+        <div style="width: 50%;height: 220px;">
+          <h5 style="color: white">按日统计</h5>
+          <div style="width: 100%;height: 200px;">
+            <linechart
+              :autoStop="false"
+              :top="30"
+              :bottom="30"
+              :left="40"
+              :legendTop="0"
+              yAxisName="(元)"
+              :dataset="linedata2"
+              :tooltipFormat="lineTooltipFormat"
+              :encode="[
                { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
             ]"
-          id="artj"
-        />
+              id="artj"
+            />
+          </div>
       </div>
-      <br>
-      <br>
-      <br>
-      <div style="width: 100%;height: 400px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">按周统计</h5>
-        <br>
-        <linechart
-          :autoStop="false"
-          :top="30"
-          :bottom="30"
-          :left="40"
-          :legendTop="0"
-          yAxisName="(元)"
-          :dataset="linedata3"
-          :tooltipFormat="lineTooltipFormat"
-          :encode="[
+        <div style="width: 100%;height: 200px;">
+          <linechart
+            :autoStop="false"
+            :top="30"
+            :bottom="30"
+            :left="40"
+            :legendTop="0"
+            yAxisName="(元)"
+            :dataset="linedata3"
+            :tooltipFormat="lineTooltipFormat"
+            :encode="[
               { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
             ]"
-          id="aztj"
-        />
+            id="aztj"
+          />
+        </div>
       </div>
-      <br>
-      <br>
-      <br>
-      <div style="width: 100%;height: 400px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">按月统计</h5>
-        <br>
-        <linechart
-          :autoStop="false"
-          :top="30"
-          :bottom="30"
-          :left="40"
-          :legendTop="0"
-          yAxisName="(元)"
-          :dataset="linedata4"
-          :tooltipFormat="lineTooltipFormat"
-          :encode="[
+        <div style="width: 100%;height: 200px;">
+          <linechart
+            :autoStop="false"
+            :top="30"
+            :bottom="30"
+            :left="40"
+            :legendTop="0"
+            yAxisName="(元)"
+            :dataset="linedata4"
+            :tooltipFormat="lineTooltipFormat"
+            :encode="[
               { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
             ]"
-          id="aytj"
-        />
+            id="aytj"
+          />
+        </div>
       </div>
       <br>
-      <br>
-      <br>
-      <div style="width: 100%;height: 400px;">
+      <div style="width: 100%;height: 220px;">
         <h5 style="color: white">按年统计</h5>
-        <br>
-        <linechart
-          :autoStop="false"
-          :top="30"
-          :bottom="30"
-          :left="40"
-          :legendTop="0"
-          yAxisName="(元)"
-          :dataset="linedata5"
-          :tooltipFormat="lineTooltipFormat"
-          :encode="[
+        <div style="width: 100%;height: 220px;">
+          <linechart
+            :autoStop="false"
+            :top="30"
+            :bottom="30"
+            :left="40"
+            :legendTop="0"
+            yAxisName="(元)"
+            :dataset="linedata5"
+            :tooltipFormat="lineTooltipFormat"
+            :encode="[
               { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
             ]"
-          id="antj"
-        />
+            id="antj"
+          />
+        </div>
       </div>
 
 

src/pages/index/components/berths_usage.vue

@@ -211,6 +211,16 @@ export default {
       this.dashBerthsUsageStat4(params)
       this.dashBerthsUsageStat5(params)
     },
+    lineTooltipFormat(params) {
+      return `<div class="line-tooltip">
+        <div style="color: ${params[1].color}">${params[1].seriesName}: ${
+        params[0].data.thisYearAmount || "--"
+      }(元)</div>
+        <div style="color: ${params[0].color}">${params[0].seriesName}: ${
+        params[0].data.lastYearAmount || "--"
+      }(元)</div>
+      </div>`;
+    },
     dashBerthsUsageStat1(params){
       api.dashBerthsUsageStat1(params).then(res =>{
         this.linedata = res.data

src/pages/index/components/other_analyse.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="body-wrapper">
     <div class="charts">
-      <div style="width: 50%;height: 500px">
+      <div style="width: 50%;height: 220px">
         <h5 style="color: white">区域分析</h5>
         <br>
         <barchart
@@ -12,6 +12,7 @@
           :bottom="30"
           :xlabelFormat="xLabelFormat1"
           :top="60"
+          :left="60"
           yAxisName="(停车次数)"
           :tooltip="tooltipFormat1"
           :dataset="bardata"
@@ -23,15 +24,14 @@
         />
       </div>
 
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">车场数量</h5>
         <br>
         <piechart
           class="model-pie-body"
           id="ccsl"
-          :radiusArr="['30%', '70%']"
+          :radiusArr="['30%', '50%']"
           :roseType = "false"
-          :colorArr="ccsl"
           :labelFormat="['{name|{b}}', '{sub|{@value}个 {d}%}', '{hr|}']"
           :dataset="ccslvalue"
           :encode="{ itemName: 'name', value: 'value' }"
@@ -43,7 +43,7 @@
     <br>
     <br>
     <div class="charts">
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">停车分布分析</h5>
         <br>
         <barchart
@@ -66,7 +66,7 @@
         />
       </div>
 
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">余位分析</h5>
         <br>
         <barchart
@@ -97,13 +97,13 @@
     <br>
     <br>
     <div class="charts">
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">停车热点分析</h5>
         <br>
         <div class="bottom" id="map"></div>
       </div>
 
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">车流量分析</h5>
         <br>
         <linechart
@@ -130,7 +130,7 @@
     <br>
     <br>
     <div class="charts">
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height:220px;">
         <h5 style="color: white">低利用率停车场分析</h5>
         <br>
         <barchart
@@ -152,7 +152,7 @@
         />
       </div>
 
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">高峰路线分析</h5>
         <br>
         <div id="ChinaLineMap"></div>
@@ -165,7 +165,7 @@
     <br>
     <br>
     <div class="charts">
-      <div style="width: 50%;height: 500px;">
+      <div style="width: 50%;height: 220px;">
         <h5 style="color: white">车辆进场占比</h5>
         <br>
       <piechart
@@ -206,7 +206,6 @@ export default {
   },
   data() {
     return {
-      ccsl: ["#ff8700","#9078f8","#ff0000","#4cff37","#4382f6"],
       ccslvalue: [],
       bardata: [],
       tcfbfx: [],