merge bugfix

src/pages/EnergyCostAnalysis/index.jsx

@@ -37,19 +37,22 @@ function EnergyAnalysis(props) {
           <NatGas />
         </div>
         <div style={{ gridRow: 3 }}>
-          <Gas />
+          {/* <Gas /> */}
+          <ElecCost />
         </div>
       </div>
 
       <div className={cls.vvgrid + " col-4"}>
         <div className=" electronic">
-          <Energy />
+          <Energy key="2" page={2} />
         </div>
         <div className=" gas">
-          <SmokeHandle />
+          <Energy key="1" page={1} />
+          {/* <SmokeHandle /> */}
         </div>
         <div style={{ height: "100%" }}>
-          <ElecCost />
+          {/* <ElecCost /> */}
+          <SmokeHandle />
         </div>
       </div>
     </div>

src/pages/EnergyCostAnalysis/index.module.css

@@ -27,10 +27,18 @@
 	gap: 24px;
 	grid-template-rows: 128px 389px 389px;
 }
+
 .vvgrid {
-	display: grid;
-	gap: 24px;
-	grid-template-rows: 258px 258px 389px;
+	display: flex;
+	flex-direction: column;
+	gap: 32px;
+	/* display: grid;
+	gap: 32px;
+	grid-template-rows: 280px 280px 410px; */
+}
+
+.vvgrid > div {
+	flex: 1;
 }
 
 .shadowBorder {