Browse Source

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

xujunjie 1 year ago
parent
commit
f0ff107b11

+ 1 - 1
src/pages/Home/ChemCostComparison.js

@@ -332,7 +332,7 @@ export const ChemCost = ({ open, showTip = false }) => {
                 {open ? getValue(snapshot?.otc_unit || '') : '***'}
                 <span className={styles.unit}>元/m³</span>
               </div>
-              <div className={styles.name}>近一小时吨水药成本</div>
+              <div className={styles.name}>近一吨水药成本</div>
             </div>
             <div className={styles.item}>
               <div className={styles.value}>

+ 2 - 2
src/pages/Home/EnergyCostComparison.js

@@ -312,7 +312,7 @@ export const EnergyCost = ({ open, detailClick, showTip }) => {
               {open ? getValue(snapshot?.elec_unit || '') : '***'}
               <span className={styles.unit}>kWh/t</span>
             </div>
-            <div className={styles.name}>近一小时吨水电耗</div>
+            <div className={styles.name}>近一吨水电耗</div>
           </div>
           <div
             className={styles.item}
@@ -324,7 +324,7 @@ export const EnergyCost = ({ open, detailClick, showTip }) => {
               {open ? getValue(snapshot?.elec || '') : '***'}
               <span className={styles.unit}>kWh</span>
             </div>
-            <div className={styles.name}>近一小时用电量</div>
+            <div className={styles.name}>近一用电量</div>
           </div>
           <div
             className={styles.item}

+ 3 - 3
src/pages/Home/WaterAmtMng.js

@@ -66,11 +66,11 @@ export const WaterAmt = ({ showTip }) => {
   const status = useMemo(() => {
     switch (snapshot?.dwa_status) {
       case 1:
-        return '当前处于供水高峰期';
+        return '当前处于供水高峰期';
       case 2:
-        return '当前处于外供水平时期';
+        return '当前处于供水高峰期';
       case 3:
-        return '当前处于供水低峰期';
+        return '当前处于供水低峰期';
     }
   }, [snapshot?.dwa_status]);
 

+ 3 - 3
src/pages/Home/index.js

@@ -121,11 +121,11 @@ const WaterAmt = (props) => {
   const status = useMemo(() => {
     switch (data?.dwa_status) {
       case 1:
-        return '当前处于供水高峰期';
+        return '当前处于供水高峰期';
       case 2:
-        return '当前处于外供水平时期';
+        return '当前处于供水均衡期';
       case 3:
-        return '当前处于供水低峰期';
+        return '当前处于供水低峰期';
     }
   }, [data?.dwa_status]);