Browse Source

fix: 泊位营收情况、停车运行监控

zouooh 1 year ago
parent
commit
67b1387bae

+ 17 - 16
src/pages/index/components/berths_revenue.vue

@@ -45,8 +45,7 @@
45 45
           :dataset="linedata"
46 46
           :tooltipFormat="lineTooltipFormat"
47 47
           :encode="[
48
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
49
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
48
+              { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
50 49
             ]"
51 50
           id="axstj"
52 51
         />
@@ -67,8 +66,7 @@
67 66
           :dataset="linedata2"
68 67
           :tooltipFormat="lineTooltipFormat"
69 68
           :encode="[
70
-                { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
71
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
69
+               { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
72 70
             ]"
73 71
           id="artj"
74 72
         />
@@ -89,8 +87,7 @@
89 87
           :dataset="linedata3"
90 88
           :tooltipFormat="lineTooltipFormat"
91 89
           :encode="[
92
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
93
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
90
+              { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
94 91
             ]"
95 92
           id="aztj"
96 93
         />
@@ -111,8 +108,7 @@
111 108
           :dataset="linedata4"
112 109
           :tooltipFormat="lineTooltipFormat"
113 110
           :encode="[
114
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
115
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
111
+              { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
116 112
             ]"
117 113
           id="aytj"
118 114
         />
@@ -130,11 +126,10 @@
130 126
           :left="40"
131 127
           :legendTop="0"
132 128
           yAxisName="(元)"
133
-          :dataset="linedata2"
129
+          :dataset="linedata5"
134 130
           :tooltipFormat="lineTooltipFormat"
135 131
           :encode="[
136
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
137
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
132
+              { x: 'mouth', y: 'lastAmount', seriesName: '',bool:'true' },
138 133
             ]"
139 134
           id="antj"
140 135
         />
@@ -189,28 +184,34 @@ export default {
189 184
     onSubmit() {
190 185
       console.log('submit!');
191 186
     },
187
+    lineTooltipFormat(params) {
188
+      return `<div class="line-tooltip">
189
+        <div style="color: ${params[0].color}">${params[0].data.mouth} : ${
190
+        params[0].data.lastAmount  || "--"
191
+      }元</div>`;
192
+    },
192 193
     dashBerthsRevenueStat1(){
193
-      api.dashBerthsRevenueStat1().then(res =>{
194
+      api.dashBerthsRevenueStat1({}).then(res =>{
194 195
         this.linedata = res.data
195 196
       })
196 197
     },
197 198
     dashBerthsRevenueStat2(){
198
-      api.dashBerthsRevenueStat2().then(res =>{
199
+      api.dashBerthsRevenueStat2({}).then(res =>{
199 200
         this.linedata2 = res.data
200 201
       })
201 202
     },
202 203
     dashBerthsRevenueStat3(){
203
-      api.dashBerthsRevenueStat3().then(res =>{
204
+      api.dashBerthsRevenueStat3({}).then(res =>{
204 205
         this.linedata3 = res.data
205 206
       })
206 207
     },
207 208
     dashBerthsRevenueStat4(){
208
-      api.dashBerthsRevenueStat4().then(res =>{
209
+      api.dashBerthsRevenueStat4({}).then(res =>{
209 210
         this.linedata4 = res.data
210 211
       })
211 212
     },
212 213
     dashBerthsRevenueStat5(){
213
-      api.dashBerthsRevenueStat5().then(res =>{
214
+      api.dashBerthsRevenueStat5({}).then(res =>{
214 215
         this.linedata5 = res.data
215 216
       })
216 217
     },

+ 2 - 2
src/pages/index/components/park_monitor.vue

@@ -12,10 +12,10 @@
12 12
           id="chart1"
13 13
           :radiusArr="['30%', '70%']"
14 14
           :colorArr="modelPieColor"
15
-          :labelFormat="['{mouth|{b}}', '{sub|{@thisYearAmount}辆 {d}%}','{hr|}']"
15
+          :labelFormat="['{name|{b}}', '{sub|{@value}辆 {d}%}','{hr|}']"
16 16
           :dataset="modelData"
17 17
           :roseType="false"
18
-          :encode="{ itemName: 'mouth', value: 'thisYearAmount' }"
18
+          :encode="{ itemName: 'name', value: 'value' }"
19 19
         />
20 20
       </div>
21 21
     </div>