diff --git a/src/components/公共组件/GraphBase/index.jsx b/src/components/公共组件/GraphBase/index.jsx index cc10b95..6292f90 100644 --- a/src/components/公共组件/GraphBase/index.jsx +++ b/src/components/公共组件/GraphBase/index.jsx @@ -75,6 +75,7 @@ function GraphBase(props) { ' ' + props.className } + style={{ ...props.style }} >
# diff --git a/src/components/公共组件/GraphBase/index.module.css b/src/components/公共组件/GraphBase/index.module.css index b2f25bb..a5ade5a 100644 --- a/src/components/公共组件/GraphBase/index.module.css +++ b/src/components/公共组件/GraphBase/index.module.css @@ -30,7 +30,8 @@ .middle-short { /* background: url('../../../assets/middle-short.png') no-repeat; */ - background: url('../../../assets/energy.png') no-repeat; + /* background: url('../../../assets/energy.png') no-repeat; */ + background: url('../../../assets/bg-bottom-item.png') no-repeat; background-size: 100% 100%; background-position: 0 0; } diff --git a/src/components/公共组件/产线当日缺陷分类/index.jsx b/src/components/公共组件/产线当日缺陷分类/index.jsx index c184ad4..a4ffb91 100644 --- a/src/components/公共组件/产线当日缺陷分类/index.jsx +++ b/src/components/公共组件/产线当日缺陷分类/index.jsx @@ -1,6 +1,5 @@ import cls from './index.module.css'; -import BottomBarItem from '../BottomItemBackground'; -import { Radio } from 'antd'; +import GraphBase from '../GraphBase'; import ReactECharts from 'echarts-for-react'; import { useState } from 'react'; @@ -16,10 +15,10 @@ function FaultType(props) { '#12FFF5', ], grid: { - left: 0, - top: 0, - bottom: 0, - right: 0, + left: 24, + top: 10, + bottom: 10, + right: 24, }, legend: { icon: 'circle', @@ -80,34 +79,28 @@ function FaultType(props) { { id: 4, label: '产线4', value: 'l4' }, { id: 5, label: '产线5', value: 'l5' }, ]); + + function handleDateChange(v) { + console.log('date ', v); + } + + // 根据使用的页面决定背景的大小 + const bgSize = + props.page == 'home' ? ['middle', 'short'] : ['middle', 'short']; + return ( - item.label)} + onDateChange={handleDateChange} + size={bgSize} + style={{ width: '600px' }} > -
- {/* 日周月年 */} - - {lines.map((l, index) => ( - - {l.label} - - ))} - -
-
+ ); } diff --git a/src/components/公共组件/产线缺陷统计/index.jsx b/src/components/公共组件/产线缺陷统计/index.jsx index 511622c..564d781 100644 --- a/src/components/公共组件/产线缺陷统计/index.jsx +++ b/src/components/公共组件/产线缺陷统计/index.jsx @@ -1,6 +1,5 @@ import cls from './index.module.css'; -import BottomBarItem from '../BottomItemBackground'; -import { Radio } from 'antd'; +import GraphBase from '../GraphBase'; import ReactECharts from 'echarts-for-react'; function FaultTotal(props) { @@ -137,33 +136,27 @@ function FaultTotal(props) { }, }; + function handleDateChange(v) { + console.log('date ', v); + } + + // 根据使用的页面决定背景的大小 + const bgSize = + props.page == 'home' ? ['middle', 'short'] : ['middle', 'long']; + return ( - -
- {/* 日周月年 */} - - - 日 - - - 周 - - - 月 - - - 年 - - -
+
-
+ ); } diff --git a/src/components/模块组件/总览/Bottom/index.jsx b/src/components/模块组件/总览/Bottom/index.jsx index 20af061..3692506 100644 --- a/src/components/模块组件/总览/Bottom/index.jsx +++ b/src/components/模块组件/总览/Bottom/index.jsx @@ -12,8 +12,8 @@ import cls from './index.module.css'; export default function index() { return (
- - + +
diff --git a/src/components/模块组件/质检统计/RightSide/index.jsx b/src/components/模块组件/质检统计/RightSide/index.jsx new file mode 100644 index 0000000..2c8fdf1 --- /dev/null +++ b/src/components/模块组件/质检统计/RightSide/index.jsx @@ -0,0 +1,33 @@ +import React from 'react'; +import FanInfo from '../../../公共组件/风机信息'; +import WindFrequence from '../../../公共组件/风机运行频率'; +import FaultType from '../../../公共组件/产线当日缺陷分类'; +import FaultTotal from '../../../公共组件/产线缺陷统计'; +import { motion } from 'framer-motion'; + +import cls from './index.module.less'; + +export default function index() { + return ( + +
+ +
+
+ +
+
+ ); +} diff --git a/src/components/模块组件/质检统计/RightSide/index.module.less b/src/components/模块组件/质检统计/RightSide/index.module.less new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/总览/index.jsx b/src/pages/总览/index.jsx index 12a3254..3900ea5 100644 --- a/src/pages/总览/index.jsx +++ b/src/pages/总览/index.jsx @@ -9,6 +9,7 @@ import KilnInnerRight from '../../components/模块组件/窑炉内部/RightSide import FireCheckLeft from '../../components/模块组件/退火监测/LeftSide'; import QualityCheckLeft from '../../components/模块组件/质检统计/LeftSide'; import FireCheckRight from '../../components/模块组件/退火监测/RightSide'; +import QualityCheckRight from '../../components/模块组件/质检统计/RightSide'; import V3DBG from '../../assets/V3DBG.png'; @@ -30,24 +31,6 @@ const KilnTotalRight = (props) => { ); }; -const QualityCheckRight = (props) => { - return ( - - 质检统计 RIGHT - - ); -}; - export default function Home({ active }) { console.log('[rendering...] 加载 Home页面');