diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx index c554671..39c799e 100644 --- a/src/views/Orders.jsx +++ b/src/views/Orders.jsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; import { Row, Col, Tabs, Table, Divider, Spin } from "antd"; -import { ContainerOutlined, BlockOutlined, SmileOutlined, TagsOutlined, GlobalOutlined, FullscreenOutlined, DingtalkOutlined, CarryOutOutlined, CoffeeOutlined, ClockCircleOutlined, HeartOutlined, IdcardOutlined, ContactsOutlined } from "@ant-design/icons"; +import { ContainerOutlined, BlockOutlined, SmileOutlined, TagsOutlined, GlobalOutlined, FullscreenOutlined, DingtalkOutlined, CarryOutOutlined, CoffeeOutlined, ClockCircleOutlined, HeartOutlined, IdcardOutlined, ContactsOutlined, GoogleOutlined, GooglePlusOutlined } from "@ant-design/icons"; import { stores_Context } from "../config"; import { Line, Pie } from "@ant-design/charts"; import { observer } from "mobx-react"; @@ -254,8 +254,8 @@ class Orders extends Component { const table_data = orders_store.orderCountData_Form ? this.format_data(orders_store.orderCountData_Form) : []; const data_source = orders_store.orderCountData ? orders_store.orderCountData : []; const avg_line_y = Math.round(orders_store.avgLine1); - const pie_data = comm.empty(orders_store.orderCountData_Form) ? [] : orders_store.orderCountData_Form.ordercount1; // 饼图的显示 - const pie_data2 = comm.empty(orders_store.orderCountData_Form) ? [] : orders_store.orderCountData_Form.ordercount2; + const pie_data = comm.empty(orders_store.orderCountData_Form) ? [] : orders_store.orderCountData_Form.ordercount1.filter(ele => ele.OrderTypeSN); // 饼图的显示 + const pie_data2 = comm.empty(orders_store.orderCountData_Form) ? [] : orders_store.orderCountData_Form.ordercount2.filter(ele => ele.OrderTypeSN); const config = { data: data_source, @@ -480,6 +480,7 @@ class Orders extends Component { {key: 'FoodRequirement',label: (饮食要求),}, {key: 'hobbies',label: (兴趣爱好),}, {key: 'ages',label: (年龄段),}, + {key: 'campaign',label: (PPC广告),}, ].map((ele) => { return { ...ele,