This commit is contained in:
lb
2023-12-28 16:59:43 +08:00
parent 049a0804ac
commit 2722ca6122
11 changed files with 43 additions and 37 deletions

View File

@@ -73,8 +73,6 @@ const EnergyCostChart = (props) => {
export default EnergyCostChart;
function getOptions(period, source, trend) {
console.log("trend ==> ", trend);
return {
color: ["#FFD160", "#12FFF5", "#2760FF"],
grid: { top: 32, right: 12, bottom: 56, left: 48 },

View File

@@ -19,20 +19,28 @@ function EnergyCost(props) {
</div>
<div className={cls.info__item_groups}>
<div className={cls.info__item}>
<i style={{ fontSize: "18px", fontStyle: "normal" }}>水耗量</i> :{" "}
{energyInfo?.waterQty || 0}Km³
<i style={{ fontSize: "18px", fontStyle: "normal" }}>水耗量</i>:
<span style={{ fontSize: "12px" }}>
{energyInfo?.waterQty || 0}Km³
</span>
</div>
<div className={cls.info__item}>
<i style={{ fontSize: "18px", fontStyle: "normal" }}>天然气I</i> :{" "}
{energyInfo?.ngQty1 || 0}
<i style={{ fontSize: "18px", fontStyle: "normal" }}>天然气I</i>:
<span style={{ fontSize: "12px" }}>
{energyInfo?.ngQty1 || 0}
</span>
</div>
<div className={cls.info__item}>
<i style={{ fontSize: "18px", fontStyle: "normal" }}>电耗量</i> :{" "}
{energyInfo?.elecQty2 || 0}kWh
<i style={{ fontSize: "18px", fontStyle: "normal" }}>电耗量</i>:
<span style={{ fontSize: "12px" }}>
{energyInfo?.elecQty2 || 0}kWh
</span>
</div>
<div className={cls.info__item}>
<i style={{ fontSize: "18px", fontStyle: "normal" }}>天然气II</i>{" "}
: {energyInfo?.ngQty2 || 0}
<i style={{ fontSize: "18px", fontStyle: "normal" }}>天然气II</i>:
<span style={{ fontSize: "12px" }}>
{energyInfo?.ngQty2 || 0}
</span>
</div>
</div>
</div>

View File

@@ -15,7 +15,7 @@
box-shadow: inset 0 0 17px 0px hsla(0, 0%, 100%, 0.15);
// width: 288px;
height: 56px;
font-size: 20px;
font-size: 16px;
letter-spacing: 1.43px;
line-height: 56px;
text-align: center;

View File

@@ -73,7 +73,6 @@ function preHandleStatisticData(data, legend) {
});
});
console.log("obj", obj)
const series = Array(legend.length)
.fill(1)
.map((_) => ({

View File

@@ -15,8 +15,6 @@ const GoodRateChart = (props) => {
const [dateType, setDateType] = useState("day");
const cutting = useSelector((state) => state.cutting);
console.log("cutting chart", dateType, cutting.chart[dateType]);
useEffect(() => {
setUpdateKey(Date.now());
}, [showMore]);
@@ -80,7 +78,6 @@ const GoodRateChart = (props) => {
export default GoodRateChart;
function getOptions(dataList, showMore, dateType) {
console.log("showmore", showMore);
const list = [...dataList].sort((a, b) => a.dataTime - b.dataTime);
// data: Array(7)
// .fill(1)