Merge branch 'master' of http://git.weirui0755.com/jack/parkBigScreen2

src/components/companySummary/business.vue

@@ -12,7 +12,7 @@
 
 <script>
 export default {
-    props: {
+  props: {
     chartData: {
       type: Object,
       required: true,
@@ -25,18 +25,19 @@ export default {
     }
   },
   mounted() {
-       setTimeout(() => {
+    setTimeout(() => {
       // console.log(this.chartData)
-        this.getEchartLeft1();
+      this.getEchartLeft1();
     }, 500);
   },
   methods: {
     getEchartLeft1() {
       // 实例化对象
+      // eslint-disable-next-line no-undef
       let myChart = echarts.init(document.getElementById('chart_left1'));
       let charts = { // 按顺序排列从大到小
         cityList: ['临时车', '月卡车', '免费车', '绿牌车'],
-        cityData: [this.chartData.temporaryCarNum, this.chartData.yueZuCheNum, this.chartData.freeCarNum, this.chartData.greenCarNum]
+        cityData: [this.chartData.temporaryCarNum || 0, this.chartData.yueZuCheNum || 0, this.chartData.freeCarNum || 0, this.chartData.greenCarNum || 0]
       }
 
       let top10CityList = charts.cityList;
@@ -56,6 +57,7 @@ export default {
           itemStyle: {
             normal: {
               show: true,
+              // eslint-disable-next-line no-undef
               color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
                 offset: 0,
                 color: color[x] + ', 0.3)'
@@ -75,7 +77,7 @@ export default {
       }
       //这个方法很重要，是处理小圆圈的数据和位置的
       let arr = [];
-       for (var i = 0; i < lineY.length; i++) {
+      for (var i = 0; i < lineY.length; i++) {
         arr.push({
           value: lineY[i].value,
           symbolPosition: "end",
@@ -158,27 +160,27 @@ export default {
 
         series: [
           {
-          name: '',
-          type: 'bar',
-          zlevel: 2,
-          barWidth: '7px',
-          data: lineY,
-          showBackground: true,
-          animationDuration: 1500,
+            name: '',
+            type: 'bar',
+            zlevel: 2,
+            barWidth: '7px',
+            data: lineY,
+            showBackground: true,
+            animationDuration: 1500,
             label: {
-               position:'top',
-                show: true,
-                formatter: function (params) {
-                  // console.log(params)
-                    // return params.data.realValue;
-                    var percent = Number((params.value / 100) * 100).toFixed(2) + '%';
-                    return percent;
-                },
-                color: '#fff',
-                fontSize: 12,
+              position: 'top',
+              show: true,
+              formatter: function (params) {
+                // console.log(params)
+                // return params.data.realValue;
+                var percent = Number((params.value / 100) * 100).toFixed(2) + '%';
+                return percent;
+              },
+              color: '#fff',
+              fontSize: 12,
             },
-        },
-      {
+          },
+          {
             name: "XXX",
             type: "pictorialBar",
             symbol:

src/components/companySummary/talent.vue

@@ -10,23 +10,23 @@
     <div class="dataText">
       <div class="item">
         <span class="p1 blue">{{ chartData.alipayPayAmount }}元</span>
-        <span class="p1 blue">{{ GetPercent(chartData.alipayPayAmount,0.1) }}%</span>
+        <span class="p1 blue">{{ GetPercent(chartData.alipayPayAmount, 0.1) }}%</span>
       </div>
       <div class="item">
         <span class="p1 green">{{ chartData.weixinPayAmount }}元</span>
-        <span class="p1 green">{{ GetPercent(chartData.weixinPayAmount,0.1) }}%</span>
+        <span class="p1 green">{{ GetPercent(chartData.weixinPayAmount, 0.1) }}%</span>
       </div>
       <div class="item">
         <span class="p1 y">{{ chartData.casePayAmount }}元</span>
-        <span class="p1 y">{{ GetPercent(chartData.casePayAmount,0.1) }}%</span>
+        <span class="p1 y">{{ GetPercent(chartData.casePayAmount, 0.1) }}%</span>
       </div>
       <div class="item">
         <span class="p1 r">{{ chartData.robotPayAmount }}元</span>
-        <span class="p1 r">{{ GetPercent(chartData.robotPayAmount,0.1) }}%</span>
+        <span class="p1 r">{{ GetPercent(chartData.robotPayAmount, 0.1) }}%</span>
       </div>
       <div class="item">
         <span class="p1 b">{{ chartData.unionPayAmount }}元</span>
-        <span class="p1 b">{{ GetPercent(chartData.unionPayAmount,0.1) }}%</span>
+        <span class="p1 b">{{ GetPercent(chartData.unionPayAmount, 0.1) }}%</span>
       </div>
     </div>
   </div>
@@ -123,7 +123,7 @@ export default {
 
       let option = {
         title: {
-          text: "总金额：" + this.chartData.totalAmount + " 元",
+          text: `总金额： ${this.chartData ? this.chartData.totalAmount || 0 : 0}  元`,
           top: 20,
           left: 200,
           textStyle: {

src/views/Brand.vue

@@ -238,7 +238,7 @@ export default {
       // 今日交易金额-笔数数据
       BiApi.getTodayTrade({ authCode }).then((res) => {
         // console.log(res);
-        if (res.code === 200) {
+        if (res && res.code === 200) {
           const { totalAmount, totalNum } = res.data
           this.startNumber = this.endNumber;
           this.startAmount = this.endAmount;
@@ -248,32 +248,32 @@ export default {
       });
       // 实时进出信息
       BiApi.getRealTimeInOutRecord({ authCode, pageNum: 1, pageSize: 10 }).then((res) => {
-        if (res.code === 200) {
+        if (res && res.code === 200) {
           this.realTimeInOutRecord = res.rows
         }
       });
       // 开放统计-车场排行
       BiApi.getParkingRanking({ authCode }).then((res) => {
-        this.rankData = res.data
+        if (res && res.code === 200) this.rankData = res.data
       })
       // 开放统计-支付统计
       BiApi.paymentStatistics({ authCode }).then((res) => {
-        this.payData = res.data
+        if (res && res.code === 200) this.payData = res.data
       })
       // 开放统计-收费车辆统计
       BiApi.amountCartStatistics({ authCode }).then((res) => {
-        this.payDataCar = res.data
+        if (res && res.code === 200) this.payDataCar = res.data
       })
       // 开放统计-24小时车流统计
       BiApi.todayTrafficStatistics({ authCode }).then((res) => {
-        this.todayTraffic = res.data
+        if (res && res.code === 200) this.todayTraffic = res.data
       })
       //  开放统计-24小时车辆使用统计
       BiApi.todayCarUseStatistics({ authCode }).then((res) => {
-        this.todayCarUse = res.data
+        if (res && res.code === 200) this.todayCarUse = res.data
       })
       BiApi.useCarStatistics({ authCode }).then((res) => {
-        this.useCarCon = res.data
+        if (res && res.code === 200) this.useCarCon = res.data
       })
       BiApi.parkingCarNum({ authCode }).then((res) => {
           this.geoCoordMap = {