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

src/pages/SmartReport/index.js

@@ -19,7 +19,7 @@ const SmartReport = () => {
 
   const [showRange, setShowRange] = useState(false);
   const [date, setDate] = useState({
-    stime: dayjs().subtract(8, 'day').format(FORMAT),
+    stime: dayjs().subtract(7, 'day').format(FORMAT),
     etime: dayjs().subtract(1, 'day').format(FORMAT),
   });
 
@@ -154,7 +154,7 @@ const SmartReport = () => {
     const date = { ...date };
     switch (value) {
       case '1':
-        date.stime = dayjs().subtract(8, 'day').format(FORMAT);
+        date.stime = dayjs().subtract(7, 'day').format(FORMAT);
         date.etime = dayjs().subtract(1, 'day').format(FORMAT);
         setDate(date);
         setShowRange(false);
@@ -299,7 +299,7 @@ const SmartReport = () => {
               <div className={styles.item}>累计进水：{in_water}</div>
               <div className={styles.item}>累计出水：{out_water}</div>
               <div className={styles.item}>吨水能耗：{water_electricity}</div>
-              <div className={styles.item}>吨水药耗：{water_medicine}元</div>
+              <div className={styles.item}>吨水药耗：{water_medicine}kg/m³</div>
               <div className={styles.item}>
                 系统自检次数：{self_inspection_task}次
               </div>
@@ -327,13 +327,13 @@ const SmartReport = () => {
             <ModuleTitle title="能耗" />
             <div className={styles.content}>
               <div className={styles.item}>吨水能耗：{water_electricity}</div>
-              <div className={styles.item}>累计耗能量：{electricity}</div>
+              <div className={styles.item}>累计耗电量：{electricity}kwh</div>
             </div>
           </div>
           <div className={styles.box}>
             <ModuleTitle title="药耗" />
             <div className={styles.content}>
-              <div className={styles.item}>吨水药耗：{water_medicine}</div>
+              <div className={styles.item}>吨水药耗：{water_medicine}kg/m³</div>
               <div className={styles.item}>累计用药量：{medicine}</div>
             </div>
           </div>

src/pages/SystemDaily/index.js

@@ -10,7 +10,7 @@ const SystemDaily = (props) => {
 
   const { data = {}, loading } = useRequest(queryDailyWorkReport, {
     defaultParams: [projectId],
-    onSuccess: (res) => {
+    formatResult: (res) => {
       const data = res.data;
       const result = {
         ...data,
@@ -55,7 +55,7 @@ const SystemDaily = (props) => {
         </div>
         <div className={styles.content}>
           <div className={styles.text}>
-            执行自控指令次数：{automatic_task}次
+            执行自控指令次数：{automatic_task || 0}次
           </div>
           <div className={styles.text}>
             推送优化建议：{push_optimize_task}条
@@ -77,7 +77,8 @@ const SystemDaily = (props) => {
             {work_percent}%
           </div>
           <div className={styles.text}>
-            工单完成人员第一名：{user_name}完成{user_name_count}个工单
+            工单完成人员第一名：
+            {user_name ? `${user_name}完成${user_name_count}个工单` : '暂无'}
           </div>
         </div>
       </Spin>