seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'PR' into develop

pull/111/MERGE
guangyuzhang 2022-01-05 22:19:51 +08:00
parent 7459c37ea1 827d42e898
commit 3685a06da1
11 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/package.json vendored
View File

@ -21,7 +21,8 @@
"bootstrap": "^4.5.3", "bootstrap": "^4.5.3",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"echarts": "^4.9.0", "zrender": "^5.2.1",
"echarts": "^5.2.2",
"echarts-for-react": "^2.0.16", "echarts-for-react": "^2.0.16",
"element-resize-event": "^3.0.3", "element-resize-event": "^3.0.3",
"emoji-mart": "^3.0.0", "emoji-mart": "^3.0.0",

2
web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
View File

@ -17,7 +17,7 @@ import {
import Datetime from 'react-datetime'; import Datetime from 'react-datetime';
import moment from 'moment'; import moment from 'moment';
import ReactEchartsCore from 'echarts-for-react'; import ReactEchartsCore from 'echarts-for-react';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import AppContext from '../../../context/Context'; import AppContext from '../../../context/Context';
import { getCookieValue, createCookie } from '../../../helpers/utils'; import { getCookieValue, createCookie } from '../../../helpers/utils';
import withRedirect from '../../../hoc/withRedirect'; import withRedirect from '../../../hoc/withRedirect';

9
web/src/components/MyEMS/common/SharePie.js
View File

@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
import { getGrays, getPosition, isIterableArray, numberFormatter } from '../../../helpers/utils'; import { getGrays, getPosition, isIterableArray, numberFormatter } from '../../../helpers/utils';
import SharePieItem from './SharePieItem'; import SharePieItem from './SharePieItem';
import { Card, CardBody, Col, Row } from 'reactstrap'; import { Card, CardBody, Col, Row } from 'reactstrap';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import 'echarts/lib/chart/pie'; import { PieChart } from 'echarts/charts';
import { useContext } from 'react'; import { useContext } from 'react';
import AppContext from '../../../context/Context'; import AppContext from '../../../context/Context';
echarts.use([PieChart]);
const getOption = (data, isDark) => { const getOption = (data, isDark) => {
const grays = getGrays(isDark); const grays = getGrays(isDark);
return { return {
@ -34,7 +35,9 @@ const getOption = (data, isDark) => {
type: 'pie', type: 'pie',
radius: ['100%', '87%'], radius: ['100%', '87%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
hoverAnimation: false, emphasis: {
scale: false
},
itemStyle: { itemStyle: {
borderWidth: 2, borderWidth: 2,
borderColor: isDark ? '#0E1C2F' : '#fff' borderColor: isDark ? '#0E1C2F' : '#fff'

9
web/src/components/dashboard-alt/MarketShare.js
View File

@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
import { getGrays, getPosition, isIterableArray, numberFormatter } from '../../helpers/utils'; import { getGrays, getPosition, isIterableArray, numberFormatter } from '../../helpers/utils';
import MarketShareItem from './MarketShareItem'; import MarketShareItem from './MarketShareItem';
import { Card, CardBody, Col, Row } from 'reactstrap'; import { Card, CardBody, Col, Row } from 'reactstrap';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import 'echarts/lib/chart/pie';
import { useContext } from 'react'; import { useContext } from 'react';
import AppContext from '../../context/Context'; import AppContext from '../../context/Context';
import { PieChart } from 'echarts/charts';
echarts.use([PieChart]);
const getOption = (data, isDark) => { const getOption = (data, isDark) => {
const grays = getGrays(isDark); const grays = getGrays(isDark);
return { return {
@ -34,7 +35,9 @@ const getOption = (data, isDark) => {
type: 'pie', type: 'pie',
radius: ['100%', '87%'], radius: ['100%', '87%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
hoverAnimation: false, emphasis: {
scale: false
},
itemStyle: { itemStyle: {
borderWidth: 2, borderWidth: 2,
borderColor: isDark ? '#0E1C2F' : '#fff' borderColor: isDark ? '#0E1C2F' : '#fff'

9
web/src/components/dashboard-alt/TopProducts.js
View File

@ -5,15 +5,14 @@ import CardDropdown from './CardDropdown';
import { Button, Card, CardBody } from 'reactstrap'; import { Button, Card, CardBody } from 'reactstrap';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Flex from '../common/Flex'; import Flex from '../common/Flex';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import { getPosition, getGrays } from '../../helpers/utils'; import { getPosition, getGrays } from '../../helpers/utils';
import AppContext from '../../context/Context'; import AppContext from '../../context/Context';
import { BarChart } from 'echarts/charts';
import { TooltipComponent, LegendComponent } from 'echarts/components';
import 'echarts/lib/chart/bar'; echarts.use([BarChart, TooltipComponent, LegendComponent]);
import 'echarts/lib/component/tooltip';
import 'echarts/lib/component/legend';
const getOption = (data, colors, isDark) => { const getOption = (data, colors, isDark) => {
const grays = getGrays(isDark); const grays = getGrays(isDark);
return { return {

9
web/src/components/dashboard-alt/TotalOrder.js
View File

@ -4,12 +4,13 @@ import FalconCardHeader from '../common/FalconCardHeader';
import { Badge, Card, CardBody, Col, Row } from 'reactstrap'; import { Badge, Card, CardBody, Col, Row } from 'reactstrap';
import Flex from '../common/Flex'; import Flex from '../common/Flex';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import 'echarts/lib/chart/line'; import { LineChart } from 'echarts/charts';
import { getGrays, themeColors, rgbaColor, getPosition, numberFormatter } from '../../helpers/utils'; import { getGrays, themeColors, rgbaColor, getPosition, numberFormatter } from '../../helpers/utils';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import AppContext from '../../context/Context'; import AppContext from '../../context/Context';
echarts.use([LineChart]);
const getOption = (data, isDark) => { const getOption = (data, isDark) => {
const grays = getGrays(isDark); const grays = getGrays(isDark);
return { return {
@ -63,7 +64,9 @@ const getOption = (data, isDark) => {
borderColor: themeColors.primary, borderColor: themeColors.primary,
borderWidth: 2 borderWidth: 2
}, },
hoverAnimation: true, emphasis: {
scale: true
},
data: data, data: data,
connectNulls: true, connectNulls: true,
smooth: 0.6, smooth: 0.6,

12
web/src/components/dashboard-alt/TotalSales.js
View File

@ -1,7 +1,7 @@
import React, { useContext, useState } from 'react'; import React, { useContext, useState } from 'react';
import { Card, CardBody, CustomInput } from 'reactstrap'; import { Card, CardBody, CustomInput } from 'reactstrap';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import { getPosition, getGrays, themeColors, rgbaColor, isIterableArray, capitalize } from '../../helpers/utils'; import { getPosition, getGrays, themeColors, rgbaColor, isIterableArray, capitalize } from '../../helpers/utils';
import CardDropdown from './CardDropdown'; import CardDropdown from './CardDropdown';
@ -9,12 +9,12 @@ import FalconCardHeader from '../common/FalconCardHeader';
import Flex from '../common/Flex'; import Flex from '../common/Flex';
import AppContext from '../../context/Context'; import AppContext from '../../context/Context';
import 'echarts/lib/chart/bar'; import { BarChart } from 'echarts/charts';
import 'echarts/lib/component/tooltip'; import { TooltipComponent, LegendComponent} from 'echarts/components';
import 'echarts/lib/component/legend';
import { totalSalesByMonth } from '../../data/dashboard/topProducts'; import { totalSalesByMonth } from '../../data/dashboard/topProducts';
echarts.use([BarChart, TooltipComponent, LegendComponent]);
function getFormatter(params) { function getFormatter(params) {
const { name, value } = params[0]; const { name, value } = params[0];
return `${Object.keys(totalSalesByMonth)[0]} ${name}, ${value}`; return `${Object.keys(totalSalesByMonth)[0]} ${name}, ${value}`;
@ -95,7 +95,9 @@ const getOption = (month, isDark) => {
symbol: 'circle', symbol: 'circle',
symbolSize: 10, symbolSize: 10,
smooth: false, smooth: false,
hoverAnimation: true, emphasis: {
scale: true
},
areaStyle: { areaStyle: {
color: { color: {
type: 'linear', type: 'linear',

7
web/src/components/dashboard-alt/WeeklySales.js
View File

@ -5,13 +5,14 @@ import { Badge, Card, CardBody, Col, Row, UncontrolledTooltip } from 'reactstrap
import FalconCardHeader from '../common/FalconCardHeader'; import FalconCardHeader from '../common/FalconCardHeader';
import Flex from '../common/Flex'; import Flex from '../common/Flex';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import { themeColors, getPosition, numberFormatter, getGrays } from '../../helpers/utils'; import { themeColors, getPosition, numberFormatter, getGrays } from '../../helpers/utils';
import 'echarts/lib/chart/bar'; import { BarChart } from 'echarts/charts';
import 'echarts/lib/component/tooltip'; import { TooltipComponent } from 'echarts/components';
import AppContext from '../../context/Context'; import AppContext from '../../context/Context';
echarts.use([BarChart, TooltipComponent]);
const getOption = (data, dataBackground, isDark) => { const getOption = (data, dataBackground, isDark) => {
const grays = getGrays(isDark); const grays = getGrays(isDark);
return { return {

2
web/src/components/dashboard-alt/react-echart/index.js vendored
View File

@ -1,4 +1,4 @@
import echarts from 'echarts'; import * as echarts from 'echarts';
import Core from './core'; import Core from './core';
// export the Component the echarts Object. // export the Component the echarts Object.

2
web/src/components/plugins/EchartMap.js
View File

@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
import { Button, Card, CardBody } from 'reactstrap'; import { Button, Card, CardBody } from 'reactstrap';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import PageHeader from '../common/PageHeader'; import PageHeader from '../common/PageHeader';
import FalconCardHeader from '../common/FalconCardHeader'; import FalconCardHeader from '../common/FalconCardHeader';
import FalconEditor from '../common/FalconEditor'; import FalconEditor from '../common/FalconEditor';

6
web/src/components/plugins/Echarts.js
View File

@ -2,7 +2,7 @@ import React, { Fragment, useContext } from 'react';
import { Button, Card, CardBody, Row, Col } from 'reactstrap'; import { Button, Card, CardBody, Row, Col } from 'reactstrap';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import ReactEchartsCore from 'echarts-for-react/lib/core'; import ReactEchartsCore from 'echarts-for-react/lib/core';
import echarts from 'echarts/lib/echarts'; import * as echarts from 'echarts/lib/echarts';
import PageHeader from '../common/PageHeader'; import PageHeader from '../common/PageHeader';
import FalconCardHeader from '../common/FalconCardHeader'; import FalconCardHeader from '../common/FalconCardHeader';
import FalconEditor from '../common/FalconEditor'; import FalconEditor from '../common/FalconEditor';
@ -140,7 +140,9 @@ const lineChartCode = `function linechartExample(){
borderColor: themeColors.primary, borderColor: themeColors.primary,
borderWidth: 2 borderWidth: 2
}, },
hoverAnimation: true, emphasis: {
scale: true
},
data: totalOrderData, data: totalOrderData,
connectNulls: true, connectNulls: true,
smooth: 0.6, smooth: 0.6,