Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/views/index.vue

@@ -1004,7 +1004,6 @@ export default {
       this.profitData.xData = []
       this.profitData.seriesData = []
       getProfitData({pageSize: 24, pageNum: 1}).then(res => {
-        console.log(res)
         res.rows.forEach(item => {
           if (!item.shipsName) {
             item.shipsName = ''
@@ -1014,7 +1013,7 @@ export default {
           }
           let name = item.shipsName + '-' + item.voyage
           this.profitData.xData.push(name)
-          this.profitData.seriesData.push(Number(item.profit) / 10000)
+          this.profitData.seriesData.push((Number(item.profit) / 10000).toFixed(2))
           // this.profitData.seriesData.push(item.profit)
         })
         this.oceanVessel()