Browse Source

Squashed commit of the following:merge dev

commit 62d51398442afe5afa2b36753fc850666545bbbf
Author: Renxy <18510891294@163.com>
Date:   Fri Dec 29 17:39:47 2023 +0800

    添加单位

commit 6b5ac7c88b12421893b5d2e6a7ec8ff5d5b55089
Author: Renxy <18510891294@163.com>
Date:   Fri Dec 29 15:51:14 2023 +0800

    删除test代码

commit 54a2c4e87fb9194ae82d75a8c164573d0d8c695e
Author: Renxy <18510891294@163.com>
Date:   Fri Dec 29 15:07:53 2023 +0800

    test

commit 31ddf625070e6c5231a563b327aabf1b0b3db03f
Author: Renxy <18510891294@163.com>
Date:   Fri Dec 29 15:02:55 2023 +0800

    test
Renxy 1 year ago
parent
commit
1017526a73
1 changed files with 10 additions and 6 deletions
  1. 10 6
      src/pages/SmartReport/index.js

+ 10 - 6
src/pages/SmartReport/index.js

@@ -314,8 +314,8 @@ const SmartReport = () => {
           <div className={styles.scrollContent}>
             <Box title="概览">
               <div className={styles.content}>
-                <TwoBoxItem label="累计进水" value={in_water} />
-                <TwoBoxItem label="累计出水" value={out_water} />
+                <TwoBoxItem label="累计进水(t)" value={in_water} />
+                <TwoBoxItem label="累计出水(t)" value={out_water} />
 
                 <ThreeBoxContent
                   data={[
@@ -364,8 +364,8 @@ const SmartReport = () => {
             <Box title="水量">
               <CircleContent
                 data={[
-                  { label: '累计进水', value: in_water },
-                  { label: '累计出水', value: out_water },
+                  { label: '累计进水(t)', value: in_water },
+                  { label: '累计出水(t)', value: out_water },
                 ]}
               />
             </Box>
@@ -373,7 +373,11 @@ const SmartReport = () => {
             <Box title="能耗">
               <CircleContent
                 data={[
-                  { label: '吨水能耗', value: water_electricity, unit: '' },
+                  {
+                    label: '吨水能耗',
+                    value: water_electricity,
+                    unit: 'kwh/t',
+                  },
                   { label: '累计耗电量', value: electricity, unit: 'kwh' },
                 ]}
               />
@@ -383,7 +387,7 @@ const SmartReport = () => {
               <CircleContent
                 data={[
                   { label: '吨水药耗', value: water_medicine, unit: 'kg/m³' },
-                  { label: '累计用药量', value: medicine },
+                  { label: '累计用药量', value: medicine, unit: 'kg' },
                 ]}
               />
             </Box>