diff --git a/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx b/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
index 34763a9..7e97c3f 100644
--- a/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
+++ b/src/components/RightBar/EnergyCost/EnergyCostChart/index.jsx
@@ -7,7 +7,7 @@ import ReactECharts from 'echarts-for-react';
const EnergyCostChart = (props) => {
const options = {
color: ['#FFD160', '#12FFF5', '#2760FF'],
- grid: { top: 28, right: 12, bottom: 32, left: 48 },
+ grid: { top: 32, right: 12, bottom: 20, left: 48 },
xAxis: {
type: 'category',
data: Array(7)
@@ -33,6 +33,12 @@ const EnergyCostChart = (props) => {
},
},
yAxis: {
+ name: '单位/m³',
+ nameTextStyle: {
+ color: '#fff',
+ fontSize: 10,
+ align: 'right',
+ },
type: 'value',
axisLabel: {
color: '#fff',
@@ -112,7 +118,9 @@ const EnergyCostChart = (props) => {
-
+
+
+
);
};
diff --git a/src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css b/src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css
index 9cbe438..bfb21cc 100644
--- a/src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css
+++ b/src/components/RightBar/EnergyCost/EnergyCostChart/index.module.css
@@ -1,5 +1,4 @@
.energyCostChart {
- margin-top: 12px;
height: 1px;
flex: 1;
padding-top: 8px;
diff --git a/src/components/RightBar/EnergyCost/index.module.less b/src/components/RightBar/EnergyCost/index.module.less
index a4c998c..9e1269c 100644
--- a/src/components/RightBar/EnergyCost/index.module.less
+++ b/src/components/RightBar/EnergyCost/index.module.less
@@ -2,10 +2,11 @@
background: url(../../../assets/energy.png) no-repeat;
background-size: 100% 100%;
width: 626px;
+ height: 400px;
}
.cost__info {
- margin-top: 8px;
+ margin-top: 4px;
margin-bottom: 12px;
div {
diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
index b2f3e98..132d33d 100644
--- a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
+++ b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.jsx
@@ -124,7 +124,7 @@ const SmokeTrendChart = (props) => {
return (
-
能耗趋势图
+
烟气趋势图
班次详情
@@ -175,7 +175,7 @@ const SmokeTrendChart = (props) => {
-
+
);
};
diff --git a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
index 9b41afb..2cfac9a 100644
--- a/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
+++ b/src/components/RightBar/SmokeHandle/SmokeTrendChart/index.module.css
@@ -66,6 +66,7 @@
}
.choiceBar {
+ margin: 4px 0;
}
.radioGroup * {
diff --git a/src/components/RightBar/SmokeHandle/index.module.less b/src/components/RightBar/SmokeHandle/index.module.less
index 589b265..fab10cc 100644
--- a/src/components/RightBar/SmokeHandle/index.module.less
+++ b/src/components/RightBar/SmokeHandle/index.module.less
@@ -3,7 +3,7 @@
background: url(../../../assets/smoke.png) no-repeat;
background-size: 100% 100%;
width: 626px;
-
+ height: 540px;
.smokeHandle__content {
margin-top: 8px;
}
diff --git a/src/components/RightBar/index.jsx b/src/components/RightBar/index.jsx
index 61c6c8c..9fda564 100644
--- a/src/components/RightBar/index.jsx
+++ b/src/components/RightBar/index.jsx
@@ -1,8 +1,8 @@
import React from 'react';
-import Chart1 from './Chart1';
-import Chart2 from './Chart2';
-import Chart3 from './Chart3';
+// import Chart1 from './Chart1';
+// import Chart2 from './Chart2';
+// import Chart3 from './Chart3';
// import RightChart2 from './Chart2'
import SmokeHandle from './SmokeHandle';
import EnergyCost from './EnergyCost';
@@ -14,14 +14,13 @@ import cls from './index.module.less';
export default function index() {
return (
-
-
-
-
-
-
+
+
+
+
+ {/*
-
+ */}
);
}
diff --git a/src/components/RightBar/index.module.less b/src/components/RightBar/index.module.less
index f232c5a..c23689d 100644
--- a/src/components/RightBar/index.module.less
+++ b/src/components/RightBar/index.module.less
@@ -1,4 +1,14 @@
.rightBar {
+ // background: #f00;
+
+ > div {
+ // height: 1px;
+ // flex: 1;
+
+ &:first-child {
+ margin-bottom: 24px;
+ }
+ }
}
.demoFloat {
diff --git a/src/pages/global.less b/src/pages/global.less
index 3bb4efc..1d072eb 100644
--- a/src/pages/global.less
+++ b/src/pages/global.less
@@ -6,6 +6,10 @@
flex-direction: column;
}
+.flex-1 {
+ flex: 1;
+}
+
.justify-between {
justify-content: space-between;
}