From e909784dee52e39c813f83dd0a7db6662dafc4d5 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Wed, 13 Sep 2023 12:42:08 +0800
Subject: [PATCH] 'update'

---
 src/components/BottomBar/gasi/index.jsx       | 21 +++++++++++++++++--
 .../BottomBar/gasii/gasChart/chart.config.js  |  2 +-
 .../BottomBar/gasii/gridList/index.jsx        | 16 +++++++-------
 .../GoodRateChart/index.jsx                   |  4 ++--
 .../EnergyCost/EnergyCostChart/index.jsx      | 20 +++++++++---------
 src/components/RightBar/EnergyCost/index.jsx  |  2 +-
 .../SmokeHandle/SmokeTrendChart/index.jsx     | 16 +++++++-------
 .../SmokeTrendChart/index.module.css          |  2 +-
 8 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/components/BottomBar/gasi/index.jsx b/src/components/BottomBar/gasi/index.jsx
index 1233678..60b96d5 100644
--- a/src/components/BottomBar/gasi/index.jsx
+++ b/src/components/BottomBar/gasi/index.jsx
@@ -34,12 +34,29 @@ function GasI(props) {
 			: Array(8)
 					.fill(1)
 					.map((_) => Array(7).fill(0));
+		seriesData.unshift(hisState?.wind['FE_totalair'] || 1);
+		seriesData.splice(8, 1);
 
 		// debug
 		// console.log('助燃风 chart series data', hisState?.wind, seriesData);
 		options = {
 			color: colors,
 			grid: { top: 32, right: 12, bottom: 20, left: 48 },
+			legend: {
+				show: true,
+				icon: 'roundRect',
+				top: 10,
+				right: 10,
+				padding: 0,
+				itemWidth: 8,
+				itemHeight: 8,
+				itemGap: 3,
+				height: 8,
+				textStyle: {
+					color: '#DFF1FE',
+					fontSize: 10,
+				},
+			},
 			xAxis: {
 				type: 'category',
 				data: Array(7)
@@ -66,7 +83,7 @@ function GasI(props) {
 				},
 			},
 			yAxis: {
-				name: '单位/m³',
+				name: '单位m³/h',
 				nameTextStyle: {
 					color: '#fff',
 					fontSize: 10,
@@ -95,7 +112,7 @@ function GasI(props) {
 				// max: 100,
 			},
 			series: seriesData.map((v, i) => ({
-				name: i ? i + 1 + '#助燃风' : '助燃风总流量',
+				name: i ? i + '#助燃风' : '助燃风总流量',
 				data: v,
 				type: 'line',
 				symbol: 'circle',
diff --git a/src/components/BottomBar/gasii/gasChart/chart.config.js b/src/components/BottomBar/gasii/gasChart/chart.config.js
index 08dfdf2..ccb4e29 100644
--- a/src/components/BottomBar/gasii/gasChart/chart.config.js
+++ b/src/components/BottomBar/gasii/gasChart/chart.config.js
@@ -56,7 +56,7 @@ export default function getOptions(seriesData, name) {
 			},
 		},
 		yAxis: {
-			name: '单位m³/h',
+			name: '单位Nm³/h',
 			nameTextStyle: {
 				color: '#fff',
 				fontSize: 10,
diff --git a/src/components/BottomBar/gasii/gridList/index.jsx b/src/components/BottomBar/gasii/gridList/index.jsx
index 0527285..e1ad546 100644
--- a/src/components/BottomBar/gasii/gridList/index.jsx
+++ b/src/components/BottomBar/gasii/gridList/index.jsx
@@ -7,14 +7,14 @@ function getData(type) {
 	switch (type) {
 		case 'gas-i':
 			data = [
-				{ id: 0, name: '天然气总流量', value: '0m³/h' },
-				{ id: 1, name: '1#天然气', value: '0m³/h' },
-				{ id: 2, name: '2#天然气', value: '0m³/h' },
-				{ id: 3, name: '3#天然气', value: '0m³/h' },
-				{ id: 4, name: '4#天然气', value: '0m³/h' },
-				{ id: 5, name: '5#天然气', value: '0m³/h' },
-				{ id: 6, name: '6#天然气', value: '0m³/h' },
-				{ id: 7, name: '7#天然气', value: '0m³/h' },
+				{ id: 0, name: '天然气总流量', value: '0Nm³/h' },
+				{ id: 1, name: '1#天然气', value: '0Nm³/h' },
+				{ id: 2, name: '2#天然气', value: '0Nm³/h' },
+				{ id: 3, name: '3#天然气', value: '0Nm³/h' },
+				{ id: 4, name: '4#天然气', value: '0Nm³/h' },
+				{ id: 5, name: '5#天然气', value: '0Nm³/h' },
+				{ id: 6, name: '6#天然气', value: '0Nm³/h' },
+				{ id: 7, name: '7#天然气', value: '0Nm³/h' },
 			];
 			break;
 		case 'gas-ii':
diff --git a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx
index 8968b8c..9d8540c 100644
--- a/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx
+++ b/src/components/LeftBar/substitutionCharts/GoodRateChart/index.jsx
@@ -119,9 +119,9 @@ const GoodRateChart = (props) => {
 		<div className={cls.GoodRateChart}>
 			<div className={cls.titleBar}>
 				<h2>生产良品率</h2>
-				<Switch defaultChecked onChange={handleSwitchChange} />
+				{/* <Switch defaultChecked onChange={handleSwitchChange} /> */}
 				<div className={cls.legend}>
-					<span className="legend__title">班次详情</span>
+					{/* <span className="legend__title">班次详情</span> */}
 					<ul className="legend__list">
 						<li>总量</li>
 						<li>白班</li>
diff --git a/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx b/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
index 600a67e..1d3043a 100644
--- a/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
+++ b/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
@@ -33,7 +33,7 @@ const EnergyCostChart = (props) => {
 			},
 		},
 		yAxis: {
-			name: '单位/m³',
+			name: '单位/kWh',
 			nameTextStyle: {
 				color: '#fff',
 				fontSize: 10,
@@ -43,7 +43,7 @@ const EnergyCostChart = (props) => {
 			axisLabel: {
 				color: '#fff',
 				fontSize: 12,
-				formatter: '{value} %',
+				formatter: '{value}',
 			},
 			axisLine: {
 				show: true,
@@ -92,9 +92,9 @@ const EnergyCostChart = (props) => {
 		<div className={cls.energyCostChart}>
 			<div className={cls.titleBar}>
 				<h2>能耗趋势图</h2>
-				<Switch defaultChecked onChange={handleSwitchChange} />
+				{/* <Switch defaultChecked onChange={handleSwitchChange} /> */}
 				<div className={cls.legend}>
-					<span className="legend__title">班次详情</span>
+					{/* <span className="legend__title">班次详情</span> */}
 					<ul className="legend__list">
 						<li>总量</li>
 					</ul>
@@ -102,23 +102,23 @@ const EnergyCostChart = (props) => {
 			</div>
 			<div className={cls.radioGroupWrapper}>
 				<Radio.Group
-					defaultValue="restHeat"
+					defaultValue="elecCost"
 					buttonStyle="solid"
 					className={cls.radioGroup}
 				>
+					<Radio.Button value="elecCost" className="radio-group__item">
+						电耗能
+					</Radio.Button>
 					<Radio.Button value="restHeat" className="radio-group__item">
 						余热发电
 					</Radio.Button>
 					<Radio.Button value="waterCost" className="radio-group__item">
 						水耗能
 					</Radio.Button>
-					<Radio.Button value="elecCost" className="radio-group__item">
-						电耗能
-					</Radio.Button>
-					{/* <Radio.Button value="gasCost" className="radio-group__item">
+					<Radio.Button value="gasCost" className="radio-group__item">
 						天然气
 					</Radio.Button>
-					<Radio.Button value="gasiiCost" className="radio-group__item">
+					{/* <Radio.Button value="gasiiCost" className="radio-group__item">
 						焦炉煤气
 					</Radio.Button> */}
 				</Radio.Group>
diff --git a/src/components/RightBar/EnergyCost/index.jsx b/src/components/RightBar/EnergyCost/index.jsx
index bd4ce7b..d6b4c64 100644
--- a/src/components/RightBar/EnergyCost/index.jsx
+++ b/src/components/RightBar/EnergyCost/index.jsx
@@ -16,7 +16,7 @@ function EnergyCost(props) {
 	// 	electricity = '0kWh',
 	// } = energyState;
 	let restHeat = energyState?.restHeat || '0kWh';
-	let water = energyState?.water || '0Km³';
+	let water = energyState?.water || '0m³';
 	let gasi = energyState?.gasi || '0m³';
 	let gasii = energyState?.gasii || '0m³';
 	let electricity = energyState?.electricity || '0kWh';
diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
index ecd059d..674b2c8 100644
--- a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
+++ b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
@@ -34,7 +34,7 @@ const SmokeTrendChart = (props) => {
 			},
 		},
 		yAxis: {
-			name: '单位m³/h',
+			name: '单位mg/m³',
 			nameTextStyle: {
 				color: '#fff',
 				fontSize: 10,
@@ -44,7 +44,7 @@ const SmokeTrendChart = (props) => {
 			axisLabel: {
 				color: '#fff',
 				fontSize: 12,
-				formatter: '{value} %',
+				formatter: '{value}',
 			},
 			axisLine: {
 				show: true,
@@ -125,9 +125,9 @@ const SmokeTrendChart = (props) => {
 		<div className={cls.energyCostChart}>
 			<div className={cls.titleBar}>
 				<h2>烟气趋势图</h2>
-				<Switch defaultChecked onChange={handleSwitchChange} />
+				{/* <Switch defaultChecked onChange={handleSwitchChange} /> */}
 				<div className={cls.legend}>
-					<span className="legend__title">班次详情</span>
+					{/* <span className="legend__title">班次详情</span> */}
 					<ul className="legend__list">
 						<li>总量</li>
 						<li>白班</li>
@@ -138,13 +138,10 @@ const SmokeTrendChart = (props) => {
 
 			<div className={`${cls.choiceBar} flex items-center justify-between`}>
 				<Radio.Group
-					defaultValue="oxygen"
+					defaultValue="so2"
 					buttonStyle="solid"
 					className={`${cls.radioGroup} flex items-center justify-between`}
 				>
-					<Radio.Button value="oxygen" className="radio-group__item">
-						氧气含量
-					</Radio.Button>
 					<Radio.Button value="so2" className="radio-group__item">
 						二氧化硫
 					</Radio.Button>
@@ -154,6 +151,9 @@ const SmokeTrendChart = (props) => {
 					<Radio.Button value="no2" className="radio-group__item">
 						二氧化氮
 					</Radio.Button>
+					<Radio.Button value="oxygen" className="radio-group__item">
+						氧气含量
+					</Radio.Button>
 				</Radio.Group>
 
 				<Radio.Group
diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
index 2cfac9a..940ba12 100644
--- a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
+++ b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
@@ -7,7 +7,7 @@
 	width: 400px;
 	margin-bottom: 4px;
 	display: flex;
-	justify-content: space-between;
+	/* justify-content: space-between; */
 	align-items: center;
 	color: white;
 }