Merge pull request 'zhp' (#5) from zhp into features/warning

Reviewed-on: #5

src/components/Modules/KilnOptimize/components/KilnBottomForecast/index.module.css

@@ -8,7 +8,7 @@
 }
 .item{
 	display: inline-block;
-	margin-right: 30px;
+	margin-right:45px;
 	font-size: 11px;
   position: relative;
 	color: #DFF1FE;

src/components/Modules/KilnOptimize/components/KilnMiddleForecast/index.module.css

@@ -8,7 +8,7 @@
 }
 .item{
 	display: inline-block;
-	margin-right: 30px;
+	margin-right: 45px;
 	font-size: 11px;
   position: relative;
 	color: #DFF1FE;

src/components/Modules/KilnOptimize/components/KilnTopForecast/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-08-23 14:44:30
- * @LastEditTime: 2024-08-30 17:30:51
+ * @LastEditTime: 2024-09-02 08:29:07
  * @LastEditors: zhp
  * @Description: 
  */

src/components/Modules/KilnOptimize/components/KilnTopForecast/index.module.css

@@ -8,7 +8,7 @@
 }
 .item{
 	display: inline-block;
-	margin-right: 30px;
+	margin-right: 45px;
 	font-size: 11px;
   position: relative;
 	color: #DFF1FE;

src/components/Modules/KilnOptimize/components/inputData/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-08-22 14:00:57
- * @LastEditTime: 2024-08-30 13:55:33
+ * @LastEditTime: 2024-09-02 09:50:49
  * @LastEditors: zhp
  * @Description: 
  */
@@ -82,7 +82,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.totalDataTitle
+            cls.gasTitle
           }>
             焦炉煤气设定总量
           </h2>
@@ -104,7 +104,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.paramsTitle
+            cls.windTitle
           }>
             助燃风流量
           </h2>
@@ -133,7 +133,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.totalDataTitle
+            cls.productTitle
           }>
             产品规格设定标准
           </h2>
@@ -155,7 +155,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.paramsTitle
+            cls.waterTitle
           }>
             循环水流量
           </h2>
@@ -184,7 +184,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.totalDataTitle
+            cls.peiWaterTitle
           }>
             配料水分含量
           </h2>
@@ -206,7 +206,7 @@ function InputDataToggle() {
             cls.content
           }>
            <h2 className={
-            cls.paramsTitle
+            cls.outputTitle
           }>
             玻璃液出口宽度
           </h2>

src/components/Modules/KilnOptimize/components/inputData/index.module.css

@@ -23,7 +23,7 @@
 	padding:5px 10px;
 	font-size: 32px;
 	line-height: 48px;
-	letter-spacing: 6px;
+	letter-spacing: 2px;
 	background: url(../../../../../assets/paramsData.png) no-repeat;
   background-size: 100% 90%;
 	background-position: bottom;
@@ -82,7 +82,7 @@
   backdrop-filter: blur(0px);
  }
 
-  .outTitle{
+  .outputTitle{
    flex: 1;
   height: 56px;
   position: relative;
@@ -94,7 +94,7 @@
   letter-spacing: 1px;
   text-align: right;
  }
- .outTitle::after {
+ .outputTitle::after {
   content: "";
   top: 73%;
   position: absolute;
@@ -106,3 +106,123 @@
   box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
   backdrop-filter: blur(0px);
  }
+.productTitle{
+  flex: 1;
+  height: 56px;
+  position: relative;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  letter-spacing: 1px;
+  text-align: right;
+} 
+.productTitle::after {
+  content: "";
+  top: 73%;
+  position: absolute;
+  bottom: 0;
+  left: 14%;
+  width: 85%;  /* 调整此处的宽度值来改变下划线的宽度，例如 50% 表示占文字宽度的一半 */
+  height: 4px;  /* 调整下划线的高度 */
+  background-image: linear-gradient(173deg, rgba(47, 47, 49, 0) 0%, #2BFFDF 100%);
+  box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
+  backdrop-filter: blur(0px);
+ }
+.waterTitle{
+  flex: 1;
+  height: 56px;
+  position: relative;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  letter-spacing: 1px;
+  text-align: right;
+}
+.waterTitle::after {
+  content: "";
+  top: 73%;
+  position: absolute;
+  bottom: 0;
+  left: 40%;
+  width: 60%;  /* 调整此处的宽度值来改变下划线的宽度，例如 50% 表示占文字宽度的一半 */
+  height: 4px;  /* 调整下划线的高度 */
+  background-image: linear-gradient(173deg, rgba(47, 47, 49, 0) 0%, #2BFFDF 100%);
+  box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
+  backdrop-filter: blur(0px);
+ }
+.peiWaterTitle{
+    flex: 1;
+  height: 56px;
+  position: relative;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  letter-spacing: 1px;
+  text-align: right;
+}
+.peiWaterTitle::after {
+  content: "";
+  top: 73%;
+  position: absolute;
+  bottom: 0;
+  left: 30%;
+  width: 68%;  /* 调整此处的宽度值来改变下划线的宽度，例如 50% 表示占文字宽度的一半 */
+  height: 4px;  /* 调整下划线的高度 */
+  background-image: linear-gradient(173deg, rgba(47, 47, 49, 0) 0%, #2BFFDF 100%);
+  box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
+  backdrop-filter: blur(0px);
+ }
+.windTitle{
+  flex: 1;
+  height: 56px;
+  position: relative;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  letter-spacing: 1px;
+  text-align: right;
+}
+.windTitle::after {
+  content: "";
+  top: 73%;
+  position: absolute;
+  bottom: 0;
+  left: 39%;
+  width: 59%;  /* 调整此处的宽度值来改变下划线的宽度，例如 50% 表示占文字宽度的一半 */
+  height: 4px;  /* 调整下划线的高度 */
+  background-image: linear-gradient(173deg, rgba(47, 47, 49, 0) 0%, #2BFFDF 100%);
+  box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
+  backdrop-filter: blur(0px);
+ }
+.gasTitle{
+  flex: 1;
+  height: 56px;
+  position: relative;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  letter-spacing: 1px;
+  text-align: right;
+}
+.gasTitle::after {
+  content: "";
+  top: 73%;
+  position: absolute;
+  bottom: 0;
+  left: 11%;
+  width: 88%;  /* 调整此处的宽度值来改变下划线的宽度，例如 50% 表示占文字宽度的一半 */
+  height: 4px;  /* 调整下划线的高度 */
+  background-image: linear-gradient(173deg, rgba(47, 47, 49, 0) 0%, #2BFFDF 100%);
+  box-shadow: 0px 2px 6px 0px rgba(43,255,223,0.55);
+  backdrop-filter: blur(0px);
+ }

src/components/Modules/KilnOptimize/components/leftBottomForecast/index.module.css

@@ -45,6 +45,7 @@
         width: 320px;
 				/* flex: 1; */
 				text-align: right;
+        color: rgba(255, 255, 255, 1);
 			}
 		}
 	}

src/components/Modules/KilnOptimize/components/leftMiddleForecast/index.module.css

@@ -57,6 +57,7 @@
 			.value {
 				flex: 5;
 				text-align: left;
+        color: rgba(255, 255, 255, 1);
 			}
     }
 		.info__item {
@@ -104,6 +105,7 @@
 			.value {
 				flex: 3;
 				text-align: left;
+        color: rgba(255, 255, 255, 1);
 			}
 		}
     .info__item::before{

src/components/Modules/KilnOptimize/components/leftTopForecast/index.module.css

@@ -56,6 +56,7 @@
 			.value {
 				flex: 3;
 				text-align: left;
+        color: rgba(255, 255, 255, 1);
 			}
 		}
     .info__item::before{

src/components/Modules/KilnOptimize/components/seasonButton/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-08-22 14:00:57
- * @LastEditTime: 2024-08-22 14:33:33
+ * @LastEditTime: 2024-09-02 09:30:37
  * @LastEditors: zhp
  * @Description: 
  */
@@ -48,7 +48,7 @@ function SeasonToggle() {
           }
           onClick={() => onSeasonUpdate(3)}
         >
-          夏季
+          秋季
       </div>
         <div
           className={
@@ -56,7 +56,7 @@ function SeasonToggle() {
           }
           onClick={() => onSeasonUpdate(4)}
         >
-          夏季
+          冬季
         </div>
       </div>
   );