Merge remote-tracking branch 'origin/main'

main
白封羽 2023-01-05 12:02:06 +08:00
commit 4d5d5be95f
2 changed files with 110 additions and 78 deletions

View File

@ -1,5 +1,17 @@
import React, {useEffect, useRef, useState} from 'react'; import React, {useEffect, useRef, useState} from 'react';
import {Button, Modal, UploadProps, message, Upload, UploadFile, Form, Input, DatePicker, Select, InputNumber} from 'antd'; import {
Button,
Modal,
UploadProps,
message,
Upload,
UploadFile,
Form,
Input,
DatePicker,
Select,
InputNumber
} from 'antd';
import {InboxOutlined, UploadOutlined} from '@ant-design/icons'; import {InboxOutlined, UploadOutlined} from '@ant-design/icons';
import axiosInstance from "../../../utils/axiosInstance"; import axiosInstance from "../../../utils/axiosInstance";
import dayjs, {Dayjs} from 'dayjs'; import dayjs, {Dayjs} from 'dayjs';
@ -16,41 +28,14 @@ import {
const {Dragger} = Upload; const {Dragger} = Upload;
let tempFile: File let tempFile: File | null = null
const props: UploadProps = {
name: 'file',
multiple: false,
maxCount: 1,
accept: ".png, .jpg, .jpeg",
beforeUpload: (file, fileList) => {
tempFile = file
console.log(file)
return false
},
onDrop(e) {
console.log('Dropped files', e.dataTransfer.files);
},
};
class FileUploadView extends React.Component<any, any> {
render() {
return (<Dragger {...props}>
<p className="ant-upload-drag-icon">
<InboxOutlined/>
</p>
<p className="ant-upload-text"></p>
<p className="ant-upload-hint">
: .png, .jpg, .jpeg
</p>
</Dragger>
)
}
}
function UpLoadModal(props: any) { function UpLoadModal(props: any) {
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [uploaderKey, setUploaderKey] = useState(0)
const handleOk = () => { const handleOk = () => {
if (tempFile === null)
return
setLoading(true); setLoading(true);
let data = new FormData(); let data = new FormData();
data.append('invoiceFile', tempFile) data.append('invoiceFile', tempFile)
@ -73,6 +58,11 @@ function UpLoadModal(props: any) {
props.onClose() props.onClose()
}; };
useEffect(() => {
setUploaderKey(uploaderKey+1)
tempFile = null
}, [props.open]);
return ( return (
<Modal <Modal
open={props.open} open={props.open}
@ -88,7 +78,30 @@ function UpLoadModal(props: any) {
</Button> </Button>
]} ]}
> >
<FileUploadView/> <div key={uploaderKey}>
<Dragger
multiple={false}
maxCount={1}
accept={".png, .jpg, .jpeg"}
beforeUpload={(file, fileList) => {
tempFile = file
console.log(file)
return false
}}
onRemove={(file) => {
tempFile = null
return true
}}>
<p className="ant-upload-drag-icon">
<InboxOutlined/>
</p>
<p className="ant-upload-text"></p>
<p className="ant-upload-hint">
: .png, .jpg, .jpeg
</p>
</Dragger>
</div>
</Modal> </Modal>
) )
} }
@ -281,8 +294,11 @@ class InvoiceUploadView extends React.Component<any, any> {
<Button onClick={this.showUploadView} className="uploadButton" type="primary" icon={<UploadOutlined/>}> <Button onClick={this.showUploadView} className="uploadButton" type="primary" icon={<UploadOutlined/>}>
</Button> </Button>
<UpLoadModal open={this.state.uploadModalOpen} nextStep={this.handleNextStep} onClose={this.handleUploadModalClose}/> <UpLoadModal open={this.state.uploadModalOpen} nextStep={this.handleNextStep}
<FormModal needRefresh={()=>{ this.props.needRefresh()}} open={this.state.formModalOpen} onClose={this.handleClose} onClose={this.handleUploadModalClose}/>
<FormModal needRefresh={() => {
this.props.needRefresh()
}} open={this.state.formModalOpen} onClose={this.handleClose}
invoiceIdentifyResponse={this.state.invoiceIdentifyResponse}/> invoiceIdentifyResponse={this.state.invoiceIdentifyResponse}/>
</>); </>);

View File

@ -1,10 +1,11 @@
import type {DatePickerProps, TimePickerProps} from 'antd'; import type {DatePickerProps, TimePickerProps} from 'antd';
import {theme, DatePicker, Select, Space, Card, Statistic} from 'antd'; import {theme, DatePicker, Select, Space, Card, Statistic, Spin} from 'antd';
import {ArrowDownOutlined, ArrowUpOutlined, createFromIconfontCN} from '@ant-design/icons' import {ArrowDownOutlined, ArrowUpOutlined, createFromIconfontCN} from '@ant-design/icons'
import {useEffect, useRef, useState} from "react"; import {useEffect, useRef, useState} from "react";
import ReactECharts from 'echarts-for-react'; import ReactECharts from 'echarts-for-react';
import * as Echarts from 'echarts' import * as Echarts from 'echarts'
import china from '../../assets/mapjson/china.json' import china from '../../assets/mapjson/china.json'
import dayjs, {Dayjs} from "dayjs";
// @ts-ignore // @ts-ignore
Echarts.registerMap('china', china); Echarts.registerMap('china', china);
@ -88,6 +89,13 @@ function StatView() {
const [destinationValues, setDestinationValues] = useState<any>([]) const [destinationValues, setDestinationValues] = useState<any>([])
useEffect(() => { useEffect(() => {
getStatData(dayjs())
}, []);
const getStatData = (time: Dayjs | null) => {
console.log(time)
setLoading(true)
setTimeout(() => {
setAmounts([120, 43]) setAmounts([120, 43])
setInvoiceKinds([{value: 1048, name: '增值税发票'}, setInvoiceKinds([{value: 1048, name: '增值税发票'},
{value: 735, name: '火车票'}, {value: 735, name: '火车票'},
@ -104,10 +112,15 @@ function StatView() {
setDestinationNames(['北京', '上海', '广州', '深圳', '成都']) setDestinationNames(['北京', '上海', '广州', '深圳', '成都'])
setDestinationValues([100, 80, 70, 60, 50]) setDestinationValues([100, 80, 70, 60, 50])
setLoading(false) setLoading(false)
}, []); }, 1000);
}
return ( return (
<div> <div style={{
display: "flex",
flexDirection: "column",
height: '100%'
}}>
<div style={{ <div style={{
height: 72, height: 72,
padding: '30px', padding: '30px',
@ -121,11 +134,13 @@ function StatView() {
<Option value="month"></Option> <Option value="month"></Option>
<Option value="year"></Option> <Option value="year"></Option>
</Select> </Select>
<DatePicker picker={type} onChange={(value) => console.log(value)}/> <DatePicker allowClear={false} picker={type} onChange={getStatData} defaultValue={dayjs()}/>
</Space> </Space>
</div> </div>
{loading ? {loading ?
<div></div> : <div style={{flex: 1,display: "flex", alignItems: "center", justifyContent: "center"}}>
<Spin size="large"/>
</div> :
<div> <div>
<div style={{ <div style={{
width: '100%', width: '100%',
@ -351,7 +366,8 @@ function StatView() {
<HorizontalBarChart title={'出发地'} values={departureValues} labels={departureNames}/> <HorizontalBarChart title={'出发地'} values={departureValues} labels={departureNames}/>
</Card> </Card>
<Card style={{flex: 1, flexBasis: 300, margin: 10, minWidth: 0, minHeight: 0}}> <Card style={{flex: 1, flexBasis: 300, margin: 10, minWidth: 0, minHeight: 0}}>
<HorizontalBarChart title={'目的地'} values={destinationValues} labels={destinationNames}/> <HorizontalBarChart title={'目的地'} values={destinationValues}
labels={destinationNames}/>
</Card> </Card>
</div> </div>
</div> </div>