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

解决冲突
# Conflicts:
#	src/pages/Home/index.js

src/app.ts

@@ -1,7 +1,7 @@
 // 运行时配置
 
 // import { RequestConfig, history } from '@umijs/max';
-import { getToken, GetTokenFromUrl } from '@/utils/utils';
+import { getToken, GetTokenFromUrl, UnityAction } from '@/utils/utils';
 import { RequestConfig } from '@umijs/max';
 import { message } from 'antd';
 import dayjs from 'dayjs';
@@ -95,6 +95,7 @@ const tokenExpiredHandle = (code: number) => {
       tokenFlag = false;
     }, 50000);
     message.error('token失效，请重新登录');
+    UnityAction.sendMsg('sessionTimeout', {});
 
     // history.push('/login');
     return true;

src/pages/Home/index.js

@@ -5,7 +5,7 @@ import { getToken, UnityAction } from '@/utils/utils';
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, useParams, useRequest } from '@umijs/max';
 import dayjs from 'dayjs';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { getScadaPage } from '../../services/OperationManagement';
 import styles from './index.less';
 
@@ -13,6 +13,7 @@ const HomePage = (props) => {
   const { projectId } = useParams();
   const { data } = useRequest(queryConditionSnapshot, {
     defaultParams: [{ project_id: projectId }],
+    pollingInterval: 10 * 1000,
   });
 
   const getPositionPst = (e) => {
@@ -150,13 +151,14 @@ const WaterQuality = (props) => {
       <Title title="水质监测" />
       <div className={styles.boxTip}>水质监测较好</div>
       <ul>
-        <li>
-          <div className={styles.valueLong}>{getValue(data?.dsan)}</div>
-          <div className={styles.btn1}>出水余氯(ppm)</div>
+        <li style={{ width: '60%' }}>
+          <div className={styles.valueLong}>{getValue(data?.dtds)}</div>
+          <div className={styles.btn1}>外供水电导率(µs/cm)</div>
         </li>
-        <li>
-          <div className={styles.valueLong}>{getValue(data?.dtur)}</div>
-          <div className={styles.btn2}>出水浊度(NTU)</div>
+
+        <li style={{ width: '40%' }}>
+          <div className={styles.valueLong}>{data?.dph || 0}</div>
+          <div className={styles.btn2}>外供水(PH)</div>
         </li>
       </ul>
     </div>
@@ -230,6 +232,10 @@ const Electric = (props) => {
     >
       <Title title="能耗监测" />
       <ul>
+        <li>
+          <div className={styles.value}>{getValue(data?.elec_unit)}</div>
+          <div className={styles.btn1}>吨水电耗(KWh/m³)</div>
+        </li>
         <li>
           <div className={styles.value}>{getValue(data?.elec)}</div>
           <div className={styles.btn1}>用电量(KWh/h)</div>
@@ -242,6 +248,7 @@ const Electric = (props) => {
 const Medicine = () => {
   const { projectId } = useParams();
   const time = dayjs().format('YYYY-MM');
+  const [open, setOpen] = useState(false);
 
   const { data } = useRequest(getComparisonData, {
     defaultParams: [
@@ -257,17 +264,30 @@ const Medicine = () => {
       return res[0];
     },
   });
+  const title = (
+    <>
+      药耗监测
+      <div
+        onClick={(e) => {
+          e.stopPropagation();
+          setOpen(!open);
+        }}
+        style={{ marginLeft: 10 }}
+        className={`password-eye ${open ? 'open' : ''}`}
+      ></div>
+    </>
+  );
 
   return (
     <div
       className={styles.medicine}
       onClick={() => UnityAction.sendMsg('menuItem', '药耗监测')}
     >
-      <Title title="药耗监测" />
+      <Title title={title} />
       <ul>
         <li>
           <div className={styles.valueLong}>
-            {data?.value?.toFixed(2) || '-'}
+            {open ? data?.value?.toFixed(2) : '*****'}
           </div>
           <div className={styles.btn1}>当月吨水药成本(元)</div>
         </li>

src/pages/Home/index.less

@@ -299,7 +299,7 @@
 .btn1 {
   margin-bottom: 20px;
   padding: 14px 28px;
-  font-size: 32px;
+  font-size: 28px;
   font-family: Source Han Sans, Source Han Sans;
   font-weight: 500;
   color: #ffffff;

src/pages/Smart/index.js

@@ -95,12 +95,7 @@ const Work = (props) => {
               <li>
                 <i></i>外供水电导率：{data?.dtds}
               </li>
-              <li>
-                <i></i>外供水浊度：{data?.dtur}
-              </li>
-              <li>
-                <i></i>外供水余氯：{data?.dsan}
-              </li>
+           
             </ul>
           </div>
         </Col>