diff --git a/src/assets/bg-bottom-item.png b/src/assets/bg-bottom-item.png new file mode 100644 index 0000000..a45ee8e Binary files /dev/null and b/src/assets/bg-bottom-item.png differ diff --git a/src/components/BottomBar/BottomBarItem/index.jsx b/src/components/BottomBar/BottomBarItem/index.jsx new file mode 100644 index 0000000..c321033 --- /dev/null +++ b/src/components/BottomBar/BottomBarItem/index.jsx @@ -0,0 +1,14 @@ +import cls from './index.module.css'; +import Container from '../../Container'; + +function BottomBarItem(props) { + return ( + + {props.children} + + ); +} diff --git a/src/components/BottomBar/BottomBarItem/index.module.css b/src/components/BottomBar/BottomBarItem/index.module.css new file mode 100644 index 0000000..24de92e --- /dev/null +++ b/src/components/BottomBar/BottomBarItem/index.module.css @@ -0,0 +1,4 @@ +.bottomBarItem { + background: url(../../../assets/bg-bottom-item.png) no-repeat; + background-size: 100% 100%; +} \ No newline at end of file diff --git a/src/components/BottomBar/FaultTotal/index.jsx b/src/components/BottomBar/FaultTotal/index.jsx new file mode 100644 index 0000000..f6dccc7 --- /dev/null +++ b/src/components/BottomBar/FaultTotal/index.jsx @@ -0,0 +1,12 @@ +import cls from './index.module.css'; +import BottomBarItem from '../BottomBarItem'; + +function FaultTotal(props) { + return ( + + 产线缺陷统计 堆叠图 颜色 上下legend 日周月年 + + ); +} + +export default FaultTotal; diff --git a/src/components/BottomBar/FaultTotal/index.module.css b/src/components/BottomBar/FaultTotal/index.module.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/BottomBar/FaultType/index.jsx b/src/components/BottomBar/FaultType/index.jsx new file mode 100644 index 0000000..601951c --- /dev/null +++ b/src/components/BottomBar/FaultType/index.jsx @@ -0,0 +1,16 @@ +import cls from './index.module.css'; +import BottomBarItem from '../BottomBarItem'; + +function FaultType(props) { + return ( + + 产线当日缺陷分类 - 环形图 左右 legend - 产线1-5 + + ); +} + +export default FaultType; diff --git a/src/components/BottomBar/FaultType/index.module.css b/src/components/BottomBar/FaultType/index.module.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/BottomBar/gasi/index.jsx b/src/components/BottomBar/gasi/index.jsx new file mode 100644 index 0000000..6402e94 --- /dev/null +++ b/src/components/BottomBar/gasi/index.jsx @@ -0,0 +1,12 @@ +import cls from './index.module.css'; +import BottomBarItem from '../BottomBarItem'; + +function GasI(props) { + return ( + + 助燃风流量 - linechart - 当前流量 - 0 legends - 1 line + + ); +} + +export default GasI; diff --git a/src/components/BottomBar/gasi/index.module.css b/src/components/BottomBar/gasi/index.module.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/BottomBar/gasii/index.jsx b/src/components/BottomBar/gasii/index.jsx new file mode 100644 index 0000000..d1a5b68 --- /dev/null +++ b/src/components/BottomBar/gasii/index.jsx @@ -0,0 +1,12 @@ +import cls from './index.module.css'; +import BottomBarItem from '../BottomBarItem'; + +function GasI(props) { + return ( + + 天然气流量 - linechart - 当前流量 - 2 legends - 2 lines + + ); +} + +export default GasI; diff --git a/src/components/BottomBar/gasii/index.module.css b/src/components/BottomBar/gasii/index.module.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/BottomBar/index.jsx b/src/components/BottomBar/index.jsx index 2b85968..1829e1d 100644 --- a/src/components/BottomBar/index.jsx +++ b/src/components/BottomBar/index.jsx @@ -1,20 +1,24 @@ -import React from 'react' -import { useEffect, useState } from 'react' -import { motion } from 'framer-motion' -import Chart1 from './Chart1' -import Chart2 from './Chart2' -import Chart3 from './Chart3' -import Chart4 from './Chart4' +import React from 'react'; +import { useEffect, useState } from 'react'; +import { motion } from 'framer-motion'; +import Chart1 from './Chart1'; +import Chart2 from './Chart2'; +import Chart3 from './Chart3'; +import Chart4 from './Chart4'; -import './index.less' +import './index.less'; +import cls from './index.module.css'; export default function index() { - return ( -
- - - - -
- ) + return ( + <> +
+ + + + +
+
+ + ); } diff --git a/src/components/BottomBar/index.less b/src/components/BottomBar/index.less index 7f22ad9..d1b646e 100644 --- a/src/components/BottomBar/index.less +++ b/src/components/BottomBar/index.less @@ -1,8 +1,16 @@ .ButtonBorder { - width: 100%; - height: 100%; - - display: flex; - flex-direction: row; - justify-content: space-around; + // width: 100%; + // height: 100%; + + display: flex; + flex-direction: row; + justify-content: space-around; + + position: fixed; + bottom: 0px; + left: 200px; + + z-index: 10000; + + background-color: #000; } diff --git a/src/components/BottomBar/index.module.css b/src/components/BottomBar/index.module.css new file mode 100644 index 0000000..569bd3d --- /dev/null +++ b/src/components/BottomBar/index.module.css @@ -0,0 +1,3 @@ +.bottomBar { + background-color: #0004; +} \ No newline at end of file diff --git a/src/components/Container.jsx b/src/components/Container.jsx index c48d12c..504bf27 100644 --- a/src/components/Container.jsx +++ b/src/components/Container.jsx @@ -23,6 +23,15 @@ const Container = (props) => { case 'smoke': icon.current = IconSmoke; break; + case 'chart': + icon.current = IconSmoke; + break; + case 'puzzle': + icon.current = IconSmoke; + break; + case 'pause': + icon.current = IconSmoke; + break; } return ( diff --git a/src/pages/index.less b/src/pages/index.less index fb6c9af..7958fa5 100644 --- a/src/pages/index.less +++ b/src/pages/index.less @@ -12,7 +12,6 @@ flex-direction: row; .Center { - background: #ce862f69; margin-top: 21px; margin-left: 24px; padding: 1px;