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

src/pages/index/components/berths_information.vue

@@ -30,8 +30,8 @@
           :radiusArr="['30%', '70%']"
           :roseType = "false"
           :colorArr="modelPieColor"
-          :labelFormat="['{name|{b}}', '{sub|{@value} {d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :labelFormat="['{name|{b}}', '{sub|{@value} 个 {d}%}', '{hr|}']"
+          :dataset="modelData"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -43,8 +43,8 @@
           :radiusArr="['30%', '70%']"
           :roseType = "false"
           :colorArr="modelPieColor2"
-          :labelFormat="['{name|{b}}', '{sub|{@value} {d}%}', '{hr|}']"
-          :dataset="modelData2.list"
+          :labelFormat="['{name|{b}}', '{sub|{@value} 个 {d}%}', '{hr|}']"
+          :dataset="modelData2"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -57,8 +57,8 @@
           :radiusArr="['30%', '70%']"
           :roseType = "false"
           :colorArr="modelPieColor3"
-          :labelFormat="['{name|{b}}', '{sub|{@value} {d}%}', '{hr|}']"
-          :dataset="modelData3.list"
+          :labelFormat="['{name|{b}}', '{sub|{@value} 个 {d}%}', '{hr|}']"
+          :dataset="modelData3"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -156,29 +156,18 @@ export default {
     },
     dashBerthsInformationStat1(){
       api.dashBerthsInformationStat1({...this.formInline}).then(res =>{
-        let arr = [
-          {name: '占用', value: res.data.records[0].occupancyParkingNumber || 0},
-          {name: '空闲', value: res.data.records[0].remainParkingNumber || 0},
-        ]
-        this.modelData = arr || []
+        this.modelData = res.data
       })
     },
     dashBerthsInformationStat2(){
       api.dashBerthsInformationStat2({...this.formInline}).then(res =>{
-        let arr = [
-          {name: '有', value: res.data.records[0].hasChargingNumber || 0},
-          {name: '无', value: res.data.records[0].noChargingNumber || 0},
-        ]
-        this.modelData2 = arr || []
+        this.modelData2 = res.data
       })
     },
     dashBerthsInformationStat3(){
       api.dashBerthsInformationStat3({...this.formInline}).then(res =>{
-        let arr = [
-          {name: '有', value: res.data.records[0].hasChargeNum || 0},
-          {name: '无', value: res.data.records[0].noChargeNum || 0},
-        ]
-        this.modelData3 = arr || []
+        console.log(res.data)
+        this.modelData3 = res.data
       })
     },
   }

src/pages/index/components/berths_usage.vue

@@ -35,7 +35,8 @@
           :dataset="linedata"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'leftOut', seriesName: '出场',bool:'true' },
+              { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
           id="axstj"
         />
@@ -56,7 +57,8 @@
           :dataset="linedata2"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'comeIn', seriesName: '出场',bool:'true' },
+               { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
           id="artj"
         />
@@ -77,7 +79,8 @@
           :dataset="linedata3"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'comeIn', seriesName: '出场',bool:'true' }
+               { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
           id="aztj"
         />
@@ -98,7 +101,8 @@
           :dataset="linedata4"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'comeIn',bool:'true' },
+               { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
           id="aytj"
         />
@@ -119,7 +123,8 @@
           :dataset="linedata5"
           :tooltipFormat="lineTooltipFormat"
           :encode="[
-              { x: 'month', y: 'comeIn',bool:'true' }
+               { x: 'mouth', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
+              { x: 'mouth', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
             ]"
           id="antj"
         />

static/mung-local-config.js

@@ -1,6 +1,6 @@
 window.mungConfig = {
   dev: {
-    BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
+    BASE_API: "http://localhost:16399/luohe2_ee/api"
   },
   build: {
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"