From e11565ab7e537b2b3c6c040bff146c66e62fb403 Mon Sep 17 00:00:00 2001
From: lb <liubin@znjszx.com>
Date: Thu, 2 Nov 2023 10:38:04 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=80=80=E7=81=AB=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Container.jsx                  |  2 +-
 .../公共组件/BottomItemBackground/index.jsx   |  1 +
 src/components/公共组件/助燃风流量/index.jsx  |  7 ++++-
 src/components/公共组件/天然气流量/index.jsx  |  7 ++++-
 .../模块组件/窑炉内部/LeftSide/index.jsx      |  7 +++--
 src/components/模块组件/退火监测/1            |  1 -
 .../模块组件/退火监测/LeftSide/index.jsx      | 24 ++++++++++++++++
 .../退火监测/LeftSide/index.module.less       |  9 ++++++
 src/pages/总览/index.jsx                      | 28 +++----------------
 9 files changed, 56 insertions(+), 30 deletions(-)
 delete mode 100644 src/components/模块组件/退火监测/1
 create mode 100644 src/components/模块组件/退火监测/LeftSide/index.jsx
 create mode 100644 src/components/模块组件/退火监测/LeftSide/index.module.less

diff --git a/src/components/Container.jsx b/src/components/Container.jsx
index 41a1bcd..a5ad93f 100644
--- a/src/components/Container.jsx
+++ b/src/components/Container.jsx
@@ -38,7 +38,7 @@ const Container = (props) => {
 	}
 
 	return (
-		<div className={`${cls.container} ${props.className}`}>
+		<div className={`${cls.container} ${props.className}`} style={props.style}>
 			<div className={cls.container__head}>
 				<img
 					src={icon.current}
diff --git a/src/components/公共组件/BottomItemBackground/index.jsx b/src/components/公共组件/BottomItemBackground/index.jsx
index 0831ec1..6da5645 100644
--- a/src/components/公共组件/BottomItemBackground/index.jsx
+++ b/src/components/公共组件/BottomItemBackground/index.jsx
@@ -7,6 +7,7 @@ function BottomBarItem(props) {
 			icon={props.icon}
 			title={props.title}
 			className={`${cls.bottomBarItem} ${props.className}`}
+			style={props.style}
 		>
 			{props.children}
 		</Container>
diff --git a/src/components/公共组件/助燃风流量/index.jsx b/src/components/公共组件/助燃风流量/index.jsx
index 66bc095..826936a 100644
--- a/src/components/公共组件/助燃风流量/index.jsx
+++ b/src/components/公共组件/助燃风流量/index.jsx
@@ -149,7 +149,12 @@ function GasI(props) {
 		}
 	}
 	return (
-		<BottomBarItem icon="pause" title="助燃风流量" className={cls.gas}>
+		<BottomBarItem
+			icon="pause"
+			title="助燃风流量"
+			className={cls.gas}
+			style={props.style}
+		>
 			<div className={cls.headWidget}>
 				<div className="flex items-center">
 					<Switch size="small" defaultChecked onChange={handleSwitchChange} />
diff --git a/src/components/公共组件/天然气流量/index.jsx b/src/components/公共组件/天然气流量/index.jsx
index cfff43c..b46427d 100644
--- a/src/components/公共组件/天然气流量/index.jsx
+++ b/src/components/公共组件/天然气流量/index.jsx
@@ -31,7 +31,12 @@ function GasII(props) {
 	}
 
 	return (
-		<BottomBarItem icon="pause" title="天然气流量" className={cls.gas}>
+		<BottomBarItem
+			icon="pause"
+			title="天然气流量"
+			className={`${cls.gas} ${props.className}`}
+			style={props.style}
+		>
 			{/* legend */}
 			<div className={cls.headWidget}>
 				<div className="flex items-center">
diff --git a/src/components/模块组件/窑炉内部/LeftSide/index.jsx b/src/components/模块组件/窑炉内部/LeftSide/index.jsx
index 3dbb835..2fafb7d 100644
--- a/src/components/模块组件/窑炉内部/LeftSide/index.jsx
+++ b/src/components/模块组件/窑炉内部/LeftSide/index.jsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import Kiln from '../../../公共组件/窑炉信息/Kiln';
-import GoodProduction from '../../../公共组件/本日生产良品率/GoodProduction';
+import GasFlow from '../../../公共组件/天然气流量';
+import WindFlow from '../../../公共组件/助燃风流量';
+
 import { motion } from 'framer-motion';
 
 import cls from './index.module.less';
@@ -15,7 +17,8 @@ export default function index() {
 			transition={{ type: 'tween' }}
 		>
 			<Kiln />
-			<GoodProduction />
+			<GasFlow style={{ flex: 1, width: '100%', marginTop: '24px' }} />
+			<WindFlow style={{ flex: 1, width: '100%', marginTop: '24px' }} />
 		</motion.div>
 	);
 }
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..2fafb7d
--- /dev/null
+++ b/src/components/模块组件/退火监测/LeftSide/index.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import Kiln from '../../../公共组件/窑炉信息/Kiln';
+import GasFlow from '../../../公共组件/天然气流量';
+import WindFlow from '../../../公共组件/助燃风流量';
+
+import { motion } from 'framer-motion';
+
+import cls from './index.module.less';
+
+export default function index() {
+	return (
+		<motion.div
+			className={cls.leftBar}
+			initial={{ opacity: 0, position: 'absolute' }}
+			animate={{ opacity: 1, position: 'relative' }}
+			exit={{ opacity: 0, position: 'relative' }}
+			transition={{ type: 'tween' }}
+		>
+			<Kiln />
+			<GasFlow style={{ flex: 1, width: '100%', marginTop: '24px' }} />
+			<WindFlow style={{ flex: 1, width: '100%', marginTop: '24px' }} />
+		</motion.div>
+	);
+}
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 807302f..34da57d 100644
--- a/src/pages/总览/index.jsx
+++ b/src/pages/总览/index.jsx
@@ -3,6 +3,10 @@ import BottomBar from '../../components/模块组件/总览/Bottom';
 import RightBar from '../../components/模块组件/总览/RightSide';
 import CenterTopData from '../../components/模块组件/总览/CenterTop';
 import { AnimatePresence, motion } from 'framer-motion';
+
+import KilnInnerLeft from '../../components/模块组件/窑炉内部/LeftSide';
+import FireCheckLeft from '../../components/模块组件/退火监测/LeftSide';
+
 import V3DBG from '../../assets/V3DBG.png';
 
 const KilnTotalLeft = (props) => {
@@ -18,30 +22,6 @@ const KilnTotalLeft = (props) => {
 	);
 };
 
-const KilnInnerLeft = (props) => {
-	return (
-		<motion.div
-			initial={{ opacity: 0, position: 'absolute' }}
-			animate={{ opacity: 1, position: 'relative' }}
-			exit={{ opacity: 0, position: 'relative' }}
-			transition={{ type: 'tween' }}
-		>
-			窑炉内部侧边
-		</motion.div>
-	);
-};
-const FireCheckLeft = (props) => {
-	return (
-		<motion.div
-			initial={{ opacity: 0, position: 'absolute' }}
-			animate={{ opacity: 1, position: 'relative' }}
-			exit={{ opacity: 0, position: 'relative' }}
-			transition={{ type: 'tween' }}
-		>
-			退火监测
-		</motion.div>
-	);
-};
 const QualityCheckLeft = (props) => {
 	return (
 		<motion.div