Merge branch 'features/warning' of http://git.picaiba.com/mt-fe-group/xuchang-new into features/warning

This commit is contained in:
lb 2024-04-25 09:44:40 +08:00
commit 61477cdd30

View File

@ -146,13 +146,13 @@ function Energy(props) {
</div> </div>
</div> </div>
<span className={cls.shadowBorder + " " + cls.infoText}> <span className={cls.shadowBorder + " " + cls.infoText}>
<span style={{ lineHeight: 1.5 }}>水耗量/Km³(昨日)</span> <span style={{ lineHeight: 1.5 }}>水耗量(昨日)/Km³</span>
<span style={{ lineHeight: 1.5 }}> <span style={{ lineHeight: 1.5 }}>
{(+energyInfo?.waterQty)?.toFixed(2) || 0} {(+energyInfo?.waterQty)?.toFixed(2) || 0}
</span> </span>
</span> </span>
<span className={cls.shadowBorder + " " + cls.infoText}> <span className={cls.shadowBorder + " " + cls.infoText}>
<span style={{ lineHeight: 1.5 }}>天然气I/Nm³(累计)</span> <span style={{ lineHeight: 1.5 }}>天然气I(累计)/Nm³</span>
<span style={{ lineHeight: 1.5 }}> <span style={{ lineHeight: 1.5 }}>
{energyInfo?.ngQty1?.replace("Nm³", "") || "0Nm³"} {energyInfo?.ngQty1?.replace("Nm³", "") || "0Nm³"}
</span> </span>
@ -160,7 +160,7 @@ function Energy(props) {
<span <span
className={cls.shadowBorder + " " + cls.infoText + " " + cls.border} className={cls.shadowBorder + " " + cls.infoText + " " + cls.border}
> >
<span style={{ lineHeight: 1.5 }}>电耗量/kWh(昨日)</span> <span style={{ lineHeight: 1.5 }}>电耗量(昨日)/kWh</span>
<span style={{ lineHeight: 1.5 }}> <span style={{ lineHeight: 1.5 }}>
{(+energyInfo?.elecQty2)?.toFixed(2) || 0} {(+energyInfo?.elecQty2)?.toFixed(2) || 0}
</span> </span>
@ -168,7 +168,7 @@ function Energy(props) {
<span <span
className={cls.shadowBorder + " " + cls.infoText + " " + cls.border} className={cls.shadowBorder + " " + cls.infoText + " " + cls.border}
> >
<span style={{ lineHeight: 1.5 }}>天然气II/Nm³(累计)</span> <span style={{ lineHeight: 1.5 }}>天然气II(累计)/Nm³</span>
<span style={{ lineHeight: 1.5 }}> <span style={{ lineHeight: 1.5 }}>
{energyInfo?.ngQty2?.replace("Nm³", "") || "0Nm³"} {energyInfo?.ngQty2?.replace("Nm³", "") || "0Nm³"}
</span> </span>