diff --git a/src/components/模块组件/总览/LeftSide/index.jsx b/src/components/模块组件/总览/LeftSide/index.jsx index 6a9f367..3dbb835 100644 --- a/src/components/模块组件/总览/LeftSide/index.jsx +++ b/src/components/模块组件/总览/LeftSide/index.jsx @@ -1,14 +1,21 @@ import React from 'react'; import Kiln from '../../../公共组件/窑炉信息/Kiln'; import GoodProduction from '../../../公共组件/本日生产良品率/GoodProduction'; +import { motion } from 'framer-motion'; import cls from './index.module.less'; export default function index() { return ( -
+ -
+ ); } diff --git a/src/components/模块组件/总览/LeftSide/index.module.less b/src/components/模块组件/总览/LeftSide/index.module.less index b00435f..ee7715c 100644 --- a/src/components/模块组件/总览/LeftSide/index.module.less +++ b/src/components/模块组件/总览/LeftSide/index.module.less @@ -1,7 +1,7 @@ .leftBar { width: 625px; height: 966px; - margin-left: 40px; + // margin-left: 40px; display: flex; flex-direction: column; diff --git a/src/components/模块组件/窑炉内部/1 b/src/components/模块组件/窑炉内部/1 deleted file mode 100644 index 56a6051..0000000 --- a/src/components/模块组件/窑炉内部/1 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/src/components/模块组件/窑炉内部/LeftSide/index.jsx b/src/components/模块组件/窑炉内部/LeftSide/index.jsx new file mode 100644 index 0000000..3dbb835 --- /dev/null +++ b/src/components/模块组件/窑炉内部/LeftSide/index.jsx @@ -0,0 +1,21 @@ +import React from 'react'; +import Kiln from '../../../公共组件/窑炉信息/Kiln'; +import GoodProduction from '../../../公共组件/本日生产良品率/GoodProduction'; +import { motion } from 'framer-motion'; + +import cls from './index.module.less'; + +export default function index() { + return ( + + + + + ); +} diff --git a/src/components/模块组件/窑炉内部/LeftSide/index.module.less b/src/components/模块组件/窑炉内部/LeftSide/index.module.less new file mode 100644 index 0000000..ee7715c --- /dev/null +++ b/src/components/模块组件/窑炉内部/LeftSide/index.module.less @@ -0,0 +1,9 @@ +.leftBar { + width: 625px; + height: 966px; + // margin-left: 40px; + + display: flex; + flex-direction: column; + justify-content: space-between; +} diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 89f3f92..5c77a90 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -22,6 +22,7 @@ export default function index() {
setNavActive(v)} /> + {/* TODO: 为了不让每切换一次nav就刷新整个页面，将各个页面分别包裹在SocketContextProvider中 */} {navActive == '能耗分析' && } {navActive != '能耗分析' && } diff --git a/src/pages/总览/index.jsx b/src/pages/总览/index.jsx index 26db990..807302f 100644 --- a/src/pages/总览/index.jsx +++ b/src/pages/总览/index.jsx @@ -8,15 +8,10 @@ import V3DBG from '../../assets/V3DBG.png'; const KilnTotalLeft = (props) => { return ( 窑炉总览LEFT @@ -25,100 +20,132 @@ const KilnTotalLeft = (props) => { const KilnInnerLeft = (props) => { return ( -
- 窑炉内部LEFT -
+ 窑炉内部侧边 + ); }; const FireCheckLeft = (props) => { return ( -
- 退火监测LEFT -
+ 退火监测 + ); }; const QualityCheckLeft = (props) => { return ( -
- 质检统计LEFT -
+ 质检统计LEfT + ); }; const KilnTotalRight = (props) => { return ( -
- 窑炉总览 Right -
+ + 窑炉总览 RIGHT + ); }; const KilnInnerRight = (props) => { return ( -
- 窑炉内部LEFT -
+ 窑炉内部 RIGHT + ); }; const FireCheckRight = (props) => { return ( -
- 退火监测LEFT -
+ 退火监测 RIGHT + ); }; const QualityCheckRight = (props) => { return ( -
- 质检统计LEFT -
+ 质检统计 RIGHT + ); }; export default function Home({ active }) { - console.log('home', active); + console.log('[rendering...] 加载 Home页面'); + return (
- {/* {active == '窑炉总览' && } */} - - {active == '窑炉总览' && } + +
+ {active == '窑炉总览' && } + {active == '窑炉内部' && } + {active == '退火监测' && } + {active == '质检统计' && } +
- {active == '窑炉内部' && } - {active == '退火监测' && } - {active == '质检统计' && } {/* */}
@@ -131,10 +158,10 @@ export default function Home({ active }) {
- {active == '窑炉总览' && } - {active == '窑炉内部' && } - {active == '退火监测' && } - {active == '质检统计' && } + {active == '窑炉总览' && } + {active == '窑炉内部' && } + {active == '退火监测' && } + {active == '质检统计' && } {/* */}
); diff --git a/src/pages/能耗分析/index.jsx b/src/pages/能耗分析/index.jsx index 483d209..31e7c8e 100644 --- a/src/pages/能耗分析/index.jsx +++ b/src/pages/能耗分析/index.jsx @@ -1,3 +1,4 @@ export default function EnergyAnalysis() { + console.log('[rendering...] 加载 能耗分析页面'); return
EnergyAnalysis
; }