ZhaoJun před 1 rokem
rodič
revize
9dd08afe11

+ 3 - 3
src/components/ManagementPage/chartModule.js

@@ -102,7 +102,7 @@ const ChartModule = (props) => {
 
         if (Array.isArray(yName)) {
           if (yName.length > 2) {
-            option.grid.right = 140;
+            option.grid.right = yName.length * 60;
           }
 
           option.yAxis = yName.map((item, index) => {
@@ -270,7 +270,7 @@ const defaultOption = {
       position: 'right',
       nameTextStyle: {
         fontSize: '0.24rem',
-        align: 'right',
+        align: 'center',
         padding: [0, 0, 15, 0],
       },
       axisLabel: {
@@ -296,7 +296,7 @@ const defaultOption = {
       offset: 80,
       nameTextStyle: {
         fontSize: '0.24rem',
-        // align: 'left',
+        align: 'left',
         padding: [0, 0, 15, 0],
       },
       axisLabel: {

+ 1 - 0
src/pages/Home/EnergyCostDetail.js

@@ -313,6 +313,7 @@ const SubTitle = ({ title }) => {
         marginBottom: '0.2rem',
         fontSize: '0.28rem',
         fontWeight: '600',
+        width: '80%',
       }}
     >
       <div

+ 0 - 1
src/pages/SmartOps/operationManage/CostAnalysis/CostAnalysis.js

@@ -148,7 +148,6 @@ const CostAnalysis = () => {
   return (
     <div className="card-box" style={{ padding: '0.2rem' }}>
       <div>
-        <SubTitle title="全厂概览" />
         <div className={styles.timeBtn}>
           <RangePicker onChange={handleTimeRangeChange} />
           <Button

+ 17 - 3
src/pages/SmartOps/operationManage/index.js

@@ -4,6 +4,7 @@ import { EnergyCost } from '@/pages/Home/EnergyCostComparison';
 import { EnergyDetail } from '@/pages/Home/EnergyCostDetail';
 import { WaterQuality } from '@/pages/Home/QualityMng';
 import { WaterAmt } from '@/pages/Home/WaterAmtMng';
+import { Button } from 'antd';
 import { useState } from 'react';
 import CostAnalysis from './CostAnalysis/CostAnalysis';
 
@@ -36,10 +37,23 @@ const OperationManage = () => {
       key: '5',
       children: showEnergyDetail ? (
         <div
-          onClick={() => {
-            setShowEnergyDetail(!showEnergyDetail);
-          }}
+          className="card-box"
+          style={{ padding: '0.2rem', position: 'relative' }}
         >
+          <Button
+            style={{
+              position: 'absolute',
+              right: '0.2rem',
+              fontSize: '0.26rem',
+              height: '0.5rem',
+              zIndex: 1,
+            }}
+            onClick={() => {
+              setShowEnergyDetail(false);
+            }}
+          >
+            返回
+          </Button>
           <EnergyDetail />
         </div>
       ) : (