Haina
/
dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eslint autofix .

Browse Source
feature/2.0-sales-trade
lyt 2 years ago committed by lot
parent f086e0292d
commit 6db72f7b41
20 changed files with 229 additions and 233 deletions
Show Stats Download Patch File Download Diff File

4
package.json
Unescape Escape View File

@ -19,7 +19,9 @@
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject",
"lint": "eslint ./src",
"lint:fix": "eslint --fix --ext .js,.jsx ./src"
}, },
"browserslist": { "browserslist": {
"production": [ "production": [

4
src/charts/BillTypeSelect.jsx
Unescape Escape View File

@ -19,7 +19,7 @@ const BillTypeSelect = (props) => {
return ( return (
<Select.Option key={index} <Select.Option key={index}
value={item.cb_billtype}>{item.cb_billtype}</Select.Option> value={item.cb_billtype}>{item.cb_billtype}</Select.Option>
) );
}) })
} }
@ -27,7 +27,7 @@ const BillTypeSelect = (props) => {
</div> </div>
); );
} };
export default observer(BillTypeSelect); export default observer(BillTypeSelect);

2
src/charts/Business_unit.jsx
Unescape Escape View File

@ -23,6 +23,6 @@ const Business_unit = (props) => {
</Select> </Select>
</div> </div>
); );
} };
export default observer(Business_unit); export default observer(Business_unit);

8
src/charts/Customer_care_inchina.jsx
Unescape Escape View File

@ -4,10 +4,10 @@ import {
ContainerOutlined, ContainerOutlined,
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {Line} from "@ant-design/charts"; import {Line} from "@ant-design/charts";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import DatePickerCharts from '../charts/DatePickerCharts' import DatePickerCharts from '../charts/DatePickerCharts';
import {NavLink, useParams} from "react-router-dom"; import {NavLink, useParams} from "react-router-dom";
import * as comm from "../utils/commons"; import * as comm from "../utils/commons";
import * as config from "../config"; import * as config from "../config";
@ -22,7 +22,7 @@ const Customer_care_inchina = () => {
useEffect(() => { useEffect(() => {
}, []) }, []);
return ( return (
@ -184,6 +184,6 @@ const Customer_care_inchina = () => {
</div> </div>
); );
} };
export default observer(Customer_care_inchina); export default observer(Customer_care_inchina);

8
src/charts/Customer_care_potential.jsx
Unescape Escape View File

@ -4,10 +4,10 @@ import {
ContainerOutlined, ContainerOutlined,
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {Line} from "@ant-design/charts"; import {Line} from "@ant-design/charts";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import DatePickerCharts from '../charts/DatePickerCharts' import DatePickerCharts from '../charts/DatePickerCharts';
import {NavLink, useParams} from "react-router-dom"; import {NavLink, useParams} from "react-router-dom";
import * as comm from "../utils/commons"; import * as comm from "../utils/commons";
import * as config from "../config"; import * as config from "../config";
@ -22,7 +22,7 @@ const Customer_care_potential = () => {
useEffect(() => { useEffect(() => {
}, []) }, []);
return ( return (
@ -179,6 +179,6 @@ const Customer_care_potential = () => {
</div> </div>
); );
} };
export default observer(Customer_care_potential); export default observer(Customer_care_potential);

8
src/charts/Customer_care_regular.jsx
Unescape Escape View File

@ -5,10 +5,10 @@ import {
ContainerOutlined, ContainerOutlined,
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {Line} from "@ant-design/charts"; import {Line} from "@ant-design/charts";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import DatePickerCharts from '../charts/DatePickerCharts' import DatePickerCharts from '../charts/DatePickerCharts';
import {NavLink, useParams} from "react-router-dom"; import {NavLink, useParams} from "react-router-dom";
import * as comm from "../utils/commons"; import * as comm from "../utils/commons";
import * as config from "../config"; import * as config from "../config";
@ -22,7 +22,7 @@ const Customer_care_regular = () => {
useEffect(() => { useEffect(() => {
}, []) }, []);
return ( return (
@ -184,6 +184,6 @@ const Customer_care_regular = () => {
</div> </div>
); );
} };
export default observer(Customer_care_regular); export default observer(Customer_care_regular);

2
src/charts/ExchangeRate.jsx
Unescape Escape View File

@ -41,7 +41,7 @@ class ExchangeRate extends Component {
// }, // },
// itemTpl: '<li class="g2-tooltip-list-item"><span style="background-color:{color};" class="g2-tooltip-marker"></span><span class="g2-tooltip-name">{name}</span>: <span class="g2-tooltip-value">{value}</span></li>', // itemTpl: '<li class="g2-tooltip-list-item"><span style="background-color:{color};" class="g2-tooltip-marker"></span><span class="g2-tooltip-name">{name}</span>: <span class="g2-tooltip-value">{value}</span></li>',
customItems: items => { customItems: items => {
let result_arr = []; const result_arr = [];
items.forEach(item => { items.forEach(item => {
item.value = item.data.er_htrate + " | " + item.data.er_bankrate; item.value = item.data.er_htrate + " | " + item.data.er_bankrate;
return result_arr.push(item); return result_arr.push(item);

2
src/charts/OrdersTempTable.jsx
Unescape Escape View File

@ -93,7 +93,7 @@ class OrdersTempTable extends Component {
<Line {...line} data={ordersTemp_data.data}/> <Line {...line} data={ordersTemp_data.data}/>
)} )}
</div> </div>
) );
} }
} }

22
src/charts/Wechat_session.jsx
Unescape Escape View File

@ -1,6 +1,6 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Row, Col, List, Avatar, Space, Pagination} from 'antd'; import {Row, Col, List, Avatar, Space, Pagination} from 'antd';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import 'moment/locale/zh-cn'; import 'moment/locale/zh-cn';
@ -21,10 +21,12 @@ class Wechat_session extends Component {
const {wechatStore} = this.context; const {wechatStore} = this.context;
wechatStore.fetchContactList(user); wechatStore.fetchContactList(user);
} }
handleContactClick(contact) { handleContactClick(contact) {
const {wechatStore} = this.context; const {wechatStore} = this.context;
wechatStore.fetchChatMsgList(contact, 0, 20); wechatStore.fetchChatMsgList(contact, 0, 20);
} }
handlePageChanged(page, pageSize) { handlePageChanged(page, pageSize) {
const {wechatStore} = this.context; const {wechatStore} = this.context;
wechatStore.fetchChatMsgList(wechatStore.selectedContact, page, pageSize); wechatStore.fetchChatMsgList(wechatStore.selectedContact, page, pageSize);
@ -42,30 +44,30 @@ class Wechat_session extends Component {
/> />
{this.renderMsgContent(chatMsg)} {this.renderMsgContent(chatMsg)}
</List.Item> </List.Item>
) );
} }
renderMsgContent(chatMsg) { renderMsgContent(chatMsg) {
if (chatMsg.msgtype === 'file') { if (chatMsg.msgtype === 'file') {
return ( return (
<a href={chatMsg.content.fileurl}>{chatMsg.content.filename}</a> <a href={chatMsg.content.fileurl}>{chatMsg.content.filename}</a>
) );
} else if (chatMsg.msgtype === 'image') { } else if (chatMsg.msgtype === 'image') {
return ( return (
<img style={{width: '50%', height: '50%'}} alt={chatMsg.msgid} src={chatMsg.content.imageurl} /> <img style={{width: '50%', height: '50%'}} alt={chatMsg.msgid} src={chatMsg.content.imageurl} />
) );
} else if (chatMsg.msgtype === 'text') { } else if (chatMsg.msgtype === 'text') {
return ( return (
<>{chatMsg.content.text}</> <>{chatMsg.content.text}</>
) );
} else if (chatMsg.msgtype === 'link') { } else if (chatMsg.msgtype === 'link') {
return ( return (
<a href={chatMsg.content.link_url}>{chatMsg.content.title}</a> <a href={chatMsg.content.link_url}>{chatMsg.content.title}</a>
) );
} else { } else {
return ( return (
<>未知消息[{chatMsg.msgtype}]</> <>未知消息[{chatMsg.msgtype}]</>
) );
} }
} }
@ -86,7 +88,7 @@ class Wechat_session extends Component {
itemLayout="horizontal" itemLayout="horizontal"
dataSource={userList} dataSource={userList}
renderItem={(user) => ( renderItem={(user) => (
<List.Item onClick={() => {this.handleUserClick(user)}}> <List.Item onClick={() => {this.handleUserClick(user);}}>
<List.Item.Meta <List.Item.Meta
avatar={<Avatar src={user.avatar} />} avatar={<Avatar src={user.avatar} />}
title={user.username} title={user.username}
@ -102,7 +104,7 @@ class Wechat_session extends Component {
itemLayout="horizontal" itemLayout="horizontal"
dataSource={contactList} dataSource={contactList}
renderItem={(contact) => ( renderItem={(contact) => (
<List.Item onClick={() => {this.handleContactClick(contact)}}> <List.Item onClick={() => {this.handleContactClick(contact);}}>
<List.Item.Meta <List.Item.Meta
avatar={<Avatar src={contact.avatar} />} avatar={<Avatar src={contact.avatar} />}
title={contact.username} title={contact.username}
@ -125,7 +127,7 @@ class Wechat_session extends Component {
current={chatMsgPage.currpage} current={chatMsgPage.currpage}
pageSize={20} pageSize={20}
total={chatMsgPage.totalpage*20} total={chatMsgPage.totalpage*20}
onChange={(page, pageSize) => { this.handlePageChanged(page, pageSize)}} /> onChange={(page, pageSize) => { this.handlePageChanged(page, pageSize);}} />
</Space> </Space>
</Col> </Col>

61
src/charts/WhatsApp_session.jsx
Unescape Escape View File

@ -1,11 +1,10 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Row, Col, List, Avatar, Space, Pagination } from 'antd'; import { Row, Col, List, Avatar, Space, Pagination } from 'antd';
import {stores_Context} from '../config' import { stores_Context } from '../config';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import 'moment/locale/zh-cn'; import 'moment/locale/zh-cn';
class WhatsApp_session extends Component { class WhatsApp_session extends Component {
static contextType = stores_Context; static contextType = stores_Context;
constructor(props) { constructor(props) {
super(props); super(props);
@ -21,10 +20,12 @@ class WhatsApp_session extends Component {
const { whatsAppStore } = this.context; const { whatsAppStore } = this.context;
whatsAppStore.fetchContactList(user); whatsAppStore.fetchContactList(user);
} }
handleContactClick(contact) { handleContactClick(contact) {
const { whatsAppStore } = this.context; const { whatsAppStore } = this.context;
whatsAppStore.fetchChatMsgList(contact, 0, 20); whatsAppStore.fetchChatMsgList(contact, 0, 20);
} }
handlePageChanged(page, pageSize) { handlePageChanged(page, pageSize) {
const { whatsAppStore } = this.context; const { whatsAppStore } = this.context;
whatsAppStore.fetchChatMsgList(whatsAppStore.selectedContact, page, pageSize); whatsAppStore.fetchChatMsgList(whatsAppStore.selectedContact, page, pageSize);
@ -34,7 +35,7 @@ class WhatsApp_session extends Component {
const msgDate = new Date(chatMsg.msgtime); const msgDate = new Date(chatMsg.msgtime);
const msgDateText = msgDate.toLocaleDateString() + ' ' + msgDate.toLocaleTimeString(); const msgDateText = msgDate.toLocaleDateString() + ' ' + msgDate.toLocaleTimeString();
return ( return (
<List.Item className='ant-list-item-no-flex'> <List.Item className="ant-list-item-no-flex">
<List.Item.Meta <List.Item.Meta
avatar={<Avatar src={chatMsg.from_avatar} />} avatar={<Avatar src={chatMsg.from_avatar} />}
title={chatMsg.from_name} title={chatMsg.from_name}
@ -42,32 +43,23 @@ class WhatsApp_session extends Component {
/> />
{this.renderMsgContent(chatMsg)} {this.renderMsgContent(chatMsg)}
</List.Item> </List.Item>
) );
} }
renderMsgContent(chatMsg) { renderMsgContent(chatMsg) {
if (chatMsg.msgtype === 'file') { if (chatMsg.msgtype === 'file') {
return ( return <a href={chatMsg.content.fileurl}>{chatMsg.content.filename}</a>;
<a href={chatMsg.content.fileurl}>{chatMsg.content.filename}</a>
)
} else if (chatMsg.msgtype === 'image') { } else if (chatMsg.msgtype === 'image') {
return ( return <img style={{ width: '50%', height: '50%' }} alt={chatMsg.msgid} src={chatMsg.content.imageurl} />;
<img style={{width: '50%', height: '50%'}} alt={chatMsg.msgid} src={chatMsg.content.imageurl} />
)
} else if (chatMsg.msgtype === 'text') { } else if (chatMsg.msgtype === 'text') {
return ( return <>{chatMsg.content.text}</>;
<>{chatMsg.content.text}</>
)
} else if (chatMsg.msgtype === 'link') { } else if (chatMsg.msgtype === 'link') {
return ( return <a href={chatMsg.content.link_url}>{chatMsg.content.title}</a>;
<a href={chatMsg.content.link_url}>{chatMsg.content.title}</a>
)
} else { } else {
return ( return <>未知消息[{chatMsg.msgtype}]</>;
<>未知消息[{chatMsg.msgtype}]</>
)
} }
} }
render() { render() {
const { whatsAppStore } = this.context; const { whatsAppStore } = this.context;
const userList = whatsAppStore.userList; const userList = whatsAppStore.userList;
@ -85,11 +77,12 @@ class WhatsApp_session extends Component {
itemLayout="horizontal" itemLayout="horizontal"
dataSource={userList} dataSource={userList}
renderItem={(user) => ( renderItem={(user) => (
<List.Item onClick={() => {this.handleUserClick(user)}}> <List.Item
<List.Item.Meta onClick={() => {
avatar={<Avatar src={user.avatar} />} this.handleUserClick(user);
title={user.username} }}
/> >
<List.Item.Meta avatar={<Avatar src={user.avatar} />} title={user.username} />
</List.Item> </List.Item>
)} )}
/> />
@ -101,11 +94,12 @@ class WhatsApp_session extends Component {
itemLayout="horizontal" itemLayout="horizontal"
dataSource={contactList} dataSource={contactList}
renderItem={(contact) => ( renderItem={(contact) => (
<List.Item onClick={() => {this.handleContactClick(contact)}}> <List.Item
<List.Item.Meta onClick={() => {
avatar={<Avatar src={contact.avatar} />} this.handleContactClick(contact);
title={contact.username} }}
/> >
<List.Item.Meta avatar={<Avatar src={contact.avatar} />} title={contact.username} />
</List.Item> </List.Item>
)} )}
/> />
@ -123,16 +117,15 @@ class WhatsApp_session extends Component {
current={chatMsgPage.currpage} current={chatMsgPage.currpage}
pageSize={20} pageSize={20}
total={chatMsgPage.totalpage * 20} total={chatMsgPage.totalpage * 20}
onChange={(page, pageSize) => { this.handlePageChanged(page, pageSize)}} /> onChange={(page, pageSize) => {
this.handlePageChanged(page, pageSize);
}}
/>
</Space> </Space>
</Col> </Col>
</Row> </Row>
</> </>
); );
} }
} }
export default observer(WhatsApp_session); export default observer(WhatsApp_session);

6
src/views/AgentGroupList.jsx
Unescape Escape View File

@ -3,7 +3,7 @@ import {Row, Col, Typography, Space, DatePicker, Button, Select, Table, List} fr
import { import {
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import * as config from "../config"; import * as config from "../config";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import { NavLink, useParams } from "react-router-dom"; import { NavLink, useParams } from "react-router-dom";
@ -73,7 +73,7 @@ const AgentGroupList = () => {
format={config.DATE_FORMAT} locale={zhCNlocale} format={config.DATE_FORMAT} locale={zhCNlocale}
allowClear={false} allowClear={false}
value={[startDate, endDate]} value={[startDate, endDate]}
onChange={(dates) => {customerServicesStore.selectDateRange(dates[0], dates[1])}} onChange={(dates) => {customerServicesStore.selectDateRange(dates[0], dates[1]);}}
ranges={{ ranges={{
'本周': [moment().startOf('week'), moment().endOf('week')], '本周': [moment().startOf('week'), moment().endOf('week')],
'上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')], '上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')],
@ -137,6 +137,6 @@ const AgentGroupList = () => {
</Space> </Space>
</> </>
); );
} };
export default observer(AgentGroupList); export default observer(AgentGroupList);

32
src/views/Credit_card_bill.jsx
Unescape Escape View File

@ -18,12 +18,12 @@ const Credit_card_bill = () => {
const { bill_type_data, credit_card_data } = financial_store; const { bill_type_data, credit_card_data } = financial_store;
const format_data = data => { const format_data = data => {
let result = { dataSource: [], columns: [] }; const result = { dataSource: [], columns: [] };
if (!comm.empty(data)) { if (!comm.empty(data)) {
if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) {
// 有比较的数据 // 有比较的数据
let total_data1 = data.BillTypeDataTotal1; const total_data1 = data.BillTypeDataTotal1;
let total_data2 = data.BillTypeDataTotal2; const total_data2 = data.BillTypeDataTotal2;
result.columns = [ result.columns = [
{ {
title: "项目类型", title: "项目类型",
@ -63,8 +63,8 @@ const Credit_card_bill = () => {
], ],
}, },
]; ];
for (let item of data.BillTypeData1) { for (const item of data.BillTypeData1) {
for (let item2 of data.BillTypeData2) { for (const item2 of data.BillTypeData2) {
if (item.cb_billtype == item2.cb_billtype) { if (item.cb_billtype == item2.cb_billtype) {
result.dataSource.push({ result.dataSource.push({
key: item.key, key: item.key,
@ -122,17 +122,17 @@ const Credit_card_bill = () => {
}; };
const format_data_detail = data => { const format_data_detail = data => {
let result = { dataSource: [], columns: [] }; const result = { dataSource: [], columns: [] };
if (!comm.empty(data)) { if (!comm.empty(data)) {
let show_vs = false; let show_vs = false;
let usd_totle1, let usd_totle1;
usd_totle2, let usd_totle2;
usd_diff, let usd_diff;
usd_vs, let usd_vs;
rmb_totle1, let rmb_totle1;
rmb_totle2, let rmb_totle2;
rmb_diff, let rmb_diff;
rmb_vs = 0; let rmb_vs = 0;
usd_totle1 = Math.round(data.billdate1.reduce((a, b) => a + b.cb_usd, 0)); usd_totle1 = Math.round(data.billdate1.reduce((a, b) => a + b.cb_usd, 0));
rmb_totle1 = Math.round(data.billdate1.reduce((a, b) => a + b.cb_rmb, 0)); rmb_totle1 = Math.round(data.billdate1.reduce((a, b) => a + b.cb_rmb, 0));
if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) {
@ -227,7 +227,7 @@ const Credit_card_bill = () => {
// 格式化数据，饼图只支持数字模式 // 格式化数据，饼图只支持数字模式
const format_data_for_pie = data => { const format_data_for_pie = data => {
let result_arr = []; const result_arr = [];
if (!comm.empty(data)) { if (!comm.empty(data)) {
data.map(item => { data.map(item => {
item.cb_usd_number = parseFloat(item.cb_usd.replace(/,/g, "")); item.cb_usd_number = parseFloat(item.cb_usd.replace(/,/g, ""));
@ -252,7 +252,7 @@ const Credit_card_bill = () => {
}, },
tooltip: { tooltip: {
customItems: items => { customItems: items => {
let result_arr = []; const result_arr = [];
items.forEach(item => { items.forEach(item => {
item.value = "$" + item.data.cb_usd + " | ￥" + item.data.cb_rmb; item.value = "$" + item.data.cb_usd + " | ￥" + item.data.cb_rmb;
return result_arr.push(item); return result_arr.push(item);

8
src/views/DestinationGroupCount.jsx
Unescape Escape View File

@ -3,7 +3,7 @@ import { Row, Col, Typography, Space, DatePicker, Button, Select, Table, Divider
import { import {
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import { stores_Context } from '../config' import { stores_Context } from '../config';
import * as config from "../config"; import * as config from "../config";
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import 'moment/locale/zh-cn'; import 'moment/locale/zh-cn';
@ -24,7 +24,7 @@ const DestinationGroupCount = () => {
const handleSearchClick = () => { const handleSearchClick = () => {
customerServicesStore.fetchDestinationGroupCount(); customerServicesStore.fetchDestinationGroupCount();
} };
return ( return (
<> <>
@ -95,7 +95,7 @@ const DestinationGroupCount = () => {
format={config.DATE_FORMAT} locale={zhCNlocale} format={config.DATE_FORMAT} locale={zhCNlocale}
allowClear={false} allowClear={false}
value={[startDate, endDate]} value={[startDate, endDate]}
onChange={(dates) => { customerServicesStore.selectDateRange(dates[0], dates[1]) }} onChange={(dates) => { customerServicesStore.selectDateRange(dates[0], dates[1]); }}
ranges={{ ranges={{
'本周': [moment().startOf('week'), moment().endOf('week')], '本周': [moment().startOf('week'), moment().endOf('week')],
'上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')], '上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')],
@ -147,6 +147,6 @@ const DestinationGroupCount = () => {
</Space> </Space>
</> </>
); );
} };
export default observer(DestinationGroupCount); export default observer(DestinationGroupCount);

6
src/views/DestinationGroupList.jsx
Unescape Escape View File

@ -3,7 +3,7 @@ import {Row, Col, Typography, Space, DatePicker, Button, Select, Table, List} fr
import { import {
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import * as config from "../config"; import * as config from "../config";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import { NavLink, useParams } from "react-router-dom"; import { NavLink, useParams } from "react-router-dom";
@ -73,7 +73,7 @@ const DestinationGroupList = () => {
format={config.DATE_FORMAT} locale={zhCNlocale} format={config.DATE_FORMAT} locale={zhCNlocale}
allowClear={false} allowClear={false}
value={[startDate, endDate]} value={[startDate, endDate]}
onChange={(dates) => {customerServicesStore.selectDateRange(dates[0], dates[1])}} onChange={(dates) => {customerServicesStore.selectDateRange(dates[0], dates[1]);}}
ranges={{ ranges={{
'本周': [moment().startOf('week'), moment().endOf('week')], '本周': [moment().startOf('week'), moment().endOf('week')],
'上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')], '上周': [moment().startOf('week').subtract(7, 'days'), moment().endOf('week').subtract(7, 'days')],
@ -136,6 +136,6 @@ const DestinationGroupList = () => {
</Space> </Space>
</> </>
); );
} };
export default observer(DestinationGroupList); export default observer(DestinationGroupList);

4
src/views/Home.jsx
Unescape Escape View File

@ -1,7 +1,7 @@
import React, {Component, useContext} from 'react'; import React, {Component, useContext} from 'react';
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import {Row, Col, Button, Tabs, Table} from 'antd'; import {Row, Col, Button, Tabs, Table} from 'antd';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import { import {
SlackOutlined, SlackOutlined,
@ -26,6 +26,6 @@ const Home = () => {
</div> </div>
); );
} };
export default observer(Home); export default observer(Home);

14
src/views/Orders.jsx
Unescape Escape View File

@ -22,10 +22,10 @@ class Orders extends Component {
format_data(data) { format_data(data) {
const { date_picker_store, orders_store } = this.context; const { date_picker_store, orders_store } = this.context;
let result = { dataSource: [], columns: [] }; const result = { dataSource: [], columns: [] };
if (!comm.empty(data)) { if (!comm.empty(data)) {
let ordercountTotal1 = data.ordercountTotal1; const ordercountTotal1 = data.ordercountTotal1;
let ordercountTotal2 = data.ordercountTotal2; const ordercountTotal2 = data.ordercountTotal2;
if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) {
// 有比较的数据 // 有比较的数据
result.columns = [ result.columns = [
@ -106,10 +106,10 @@ class Orders extends Component {
]; ];
// 1.找出两个数组OrderType相同的数据做比较显示 2.找出两组数据OrderType都不相同的数据做显示 // 1.找出两个数组OrderType相同的数据做比较显示 2.找出两组数据OrderType都不相同的数据做显示
let has_same_type = false; // 数组1在数组2中是否找到相同的类型 let has_same_type = false; // 数组1在数组2中是否找到相同的类型
for (let item of data.ordercount1) { for (const item of data.ordercount1) {
has_same_type = false; has_same_type = false;
// 数组1在数组2中相同的类型 // 数组1在数组2中相同的类型
for (let item2 of data.ordercount2) { for (const item2 of data.ordercount2) {
if (item.OrderType == item2.OrderType) { if (item.OrderType == item2.OrderType) {
has_same_type = true; has_same_type = true;
result.dataSource.push({ result.dataSource.push({
@ -141,9 +141,9 @@ class Orders extends Component {
} }
} }
// 数组2中不在数组1的类型 // 数组2中不在数组1的类型
for (let item2 of data.ordercount2) { for (const item2 of data.ordercount2) {
has_same_type = false; has_same_type = false;
for (let item of data.ordercount1) { for (const item of data.ordercount1) {
if (item.OrderType == item2.OrderType) { if (item.OrderType == item2.OrderType) {
has_same_type = true; has_same_type = true;
} }

4
src/views/Orders_sub.jsx
Unescape Escape View File

@ -75,7 +75,7 @@ const Orders_sub = () => {
}; };
const format_data = data => { const format_data = data => {
let result = { dataSource: [], columns: [] }; const result = { dataSource: [], columns: [] };
if (!comm.empty(data)) { if (!comm.empty(data)) {
result.columns = [ result.columns = [
{ {
@ -103,7 +103,7 @@ const Orders_sub = () => {
}; };
const format_data_detail = data => { const format_data_detail = data => {
let result = { dataSource: [], columns: [] }; const result = { dataSource: [], columns: [] };
if (!comm.empty(data)) { if (!comm.empty(data)) {
result.columns = [ result.columns = [
{ {

11
src/views/ProtectedRoute.jsx
Unescape Escape View File

@ -4,20 +4,19 @@ import {
ContainerOutlined, ContainerOutlined,
SearchOutlined, SearchOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import {stores_Context} from '../config' import {stores_Context} from '../config';
import {Line} from "@ant-design/charts"; import {Line} from "@ant-design/charts";
import {observer} from 'mobx-react'; import {observer} from 'mobx-react';
import DatePickerCharts from '../charts/DatePickerCharts' import DatePickerCharts from '../charts/DatePickerCharts';
import {NavLink, useParams} from "react-router-dom"; import {NavLink, useParams,Outlet, useOutlet, useLocation, useNavigate} from "react-router-dom";
import * as comm from "../utils/commons"; import * as comm from "../utils/commons";
import * as config from "../config"; import * as config from "../config";
import {Outlet, useOutlet, useLocation, useNavigate} from 'react-router-dom';
const ProtectedRoute = ({auth}) => { const ProtectedRoute = ({auth}) => {
const {auth_store} = useContext(stores_Context); const {auth_store} = useContext(stores_Context);
if (auth_store.has_permission(auth)) { if (auth_store.has_permission(auth)) {
return <Outlet/> return <Outlet/>;
} }
return ( return (
@ -32,6 +31,6 @@ const ProtectedRoute = ({auth}) => {
); );
} };
export default observer(ProtectedRoute); export default observer(ProtectedRoute);

2
src/views/Sale.jsx
Unescape Escape View File

@ -48,7 +48,7 @@ const Sale = () => {
// 格式化数据，饼图只支持数字模式 // 格式化数据，饼图只支持数字模式
const format_data_for_pie = data => { const format_data_for_pie = data => {
let result_arr = []; const result_arr = [];
if (!comm.empty(data)) { if (!comm.empty(data)) {
data.map(item => { data.map(item => {
item.COLI_ML_number = comm.price_to_number(item.COLI_ML); item.COLI_ML_number = comm.price_to_number(item.COLI_ML);

Write Preview
Loading…
Cancel
Save