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

src/pages/Center/index.js

@@ -1,3 +1,4 @@
+import PageContent from '@/components/PageContent';
 import { version } from '@/constants';
 import { UnityAction } from '@/utils/utils';
 import { CloseOutlined } from '@ant-design/icons';
@@ -29,13 +30,15 @@ const Center = () => {
     UnityAction.sendMsg('closePage');
   };
   return (
-    <div className={styles.page}>
+    <PageContent closeable={false}>
+      {/* <div className={styles.page}> */}
       <div className={styles.head}>
         <div className={styles.profile} />
         <div className={styles.textContent}>
           <div className={styles.name}>{user?.CName}</div>
           <div className={styles.photo}>
-            手机号：{user?.Mobile}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;系统版本：
+            手机号：{user?.Mobile}
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;系统版本：
             {version}
           </div>
         </div>
@@ -43,8 +46,8 @@ const Center = () => {
         <CloseOutlined
           style={{
             position: 'absolute',
-            top: '40px',
-            right: '40px',
+            top: '20px',
+            right: '20px',
             fontSize: '30px',
           }}
           onClick={handleClose}
@@ -81,7 +84,8 @@ const Center = () => {
       <div className={styles.loginOut} onClick={handleLogOutClick}>
         退出登录
       </div>
-    </div>
+      {/* </div> */}
+    </PageContent>
   );
 };
 export default Center;

src/pages/Center/index.less

@@ -1,12 +1,13 @@
 .page {
-  margin: auto;
-  width: 80%;
+  // margin: auto;
+  width: 100%;
+  padding: 0 200px;
+  background-color: #ffffff;
 }
 .box {
   background: rgba(255, 255, 255, 0.78);
   box-shadow: 0px 0px 8px 4px rgba(212, 212, 212, 0.5);
   border-radius: 20px;
-  opacity: 0.8;
 }
 .head {
   .box;
@@ -86,3 +87,9 @@
   color: #ffffff;
   line-height: 97px;
 }
+.close {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  font-size: 30px;
+}

src/pages/DeviceManager/storage.js

@@ -124,7 +124,7 @@ const StorageOverview = () => {
   return (
     <PageContent closeable={false}>
       <PageTitle children="备品统计" returnable />
-      <div className={`card-box ${styles.main}`}>
+      <div className={`card-box content-title ${styles.main}`}>
         <Spin spinning={loading}>
           <ModuleTitle title="物料种类库存占比" />
           <div style={{ height: '330px' }}>

src/pages/EqSelfInspection/index.less

@@ -134,7 +134,7 @@
 }
 
 .reportBtn {
-  margin-top: 40px;
+  margin-top: 10px;
   width: 45%;
   height: 86px;
   display: inline-block;

src/pages/Smart/index.js

@@ -20,152 +20,152 @@ const Work = (props) => {
   return (
     <PageContent>
       <PageTitle>水厂工况</PageTitle>
-      <div className="content-title">
-        <div className={styles.score}>
-          <CircleScore big>
-            {data?.score}
-            <div style={{ fontSize: 24 }}>{data?.grade}</div>
-          </CircleScore>
-          <div className={styles.scoreRight}>
-            <h3>当前运行{data?.grade}，可继续优化</h3>
-            <div className={styles.time}>
-              {dayjs(data?.clac_time).format('YYYY-MM-DD HH:mm')}
-            </div>
-            {data?.score && (
-              <Button
-                style={{ marginRight: 20 }}
-                className={styles.btn}
-                type="primary"
-                onClick={() =>
-                  history.push(
-                    `/smart/optimization-tasks/${projectId}?score=${data.score}`,
-                  )
-                }
-              >
-                优化任务
-              </Button>
-            )}
-
+      {/* <div className="content-title"> */}
+      <div className={styles.score}>
+        <CircleScore big>
+          {data?.score}
+          <div style={{ fontSize: 24 }}>{data?.grade}</div>
+        </CircleScore>
+        <div className={styles.scoreRight}>
+          <h3>当前运行{data?.grade}，可继续优化</h3>
+          <div className={styles.time}>
+            {dayjs(data?.clac_time).format('YYYY-MM-DD HH:mm')}
+          </div>
+          {data?.score && (
             <Button
+              style={{ marginRight: 20 }}
               className={styles.btn}
               type="primary"
               onClick={() =>
-                history.push('/smart/condition-detection/' + projectId)
+                history.push(
+                  `/smart/optimization-tasks/${projectId}?score=${data.score}`,
+                )
               }
             >
-              工况检测
+              优化任务
             </Button>
-          </div>
+          )}
+
+          <Button
+            className={styles.btn}
+            type="primary"
+            onClick={() =>
+              history.push('/smart/condition-detection/' + projectId)
+            }
+          >
+            工况检测
+          </Button>
         </div>
-        <Row gutter={40}>
-          <Col span={12}>
-            <div className={styles.card}>
-              <h3>进水数据</h3>
-              <ul>
-                <li>
-                  <i></i>进水量：{data?.fwa}
-                </li>
-                <li>
-                  <i></i>进水温度：{data?.ft}
-                </li>
-                <li>
-                  <i></i>进水浊度：{data?.ftur}
-                </li>
-                <li>
-                  <i></i>进水压力：{data?.fpp}
-                </li>
-                {/* 与产水数据对其 */}
-                <li style={{ visibility: 'hidden' }}>
-                  <i></i>
-                </li>
-              </ul>
-            </div>
-          </Col>
-          <Col span={12}>
-            <div className={styles.card}>
-              <h3>产水数据</h3>
-              <ul>
-                <li>
-                  <i></i>外供水流量：{data?.dwa}
-                </li>
-                <li>
-                  <i></i>外供水pH：{data?.dph}
-                </li>
-                <li>
-                  <i></i>外供水电导率：{data?.dtds}
-                </li>
-                <li>
-                  <i></i>外供水浊度：{data?.dtur}
-                </li>
-                <li>
-                  <i></i>外供水余氯：{data?.dsan}
-                </li>
-              </ul>
-            </div>
-          </Col>
-          <Col span={12}>
-            <div className={styles.card}>
-              <h3>水厂负荷数据</h3>
-              <ul>
-                <li>
-                  <i></i>实际处理水量：{data?.fact_water}
-                </li>
-                <li>
-                  <i></i>设计处理水量：{data?.devise_water}
-                </li>
-              </ul>
-            </div>
-          </Col>
-          <Col span={12}>
-            <div className={styles.card2}>
-              <h3>
-                成本数据
-                <div
-                  style={{ marginLeft: 14 }}
-                  onClick={() => setOpen(!open)}
-                  className={`password-eye ${open ? 'open' : ''}`}
-                ></div>
-              </h3>
-              <ul>
-                <li>
-                  <i></i>吨水药成本：{open ? data?.otc_cost_unit : '*******'}
-                </li>
-                <li>
-                  <i></i>吨水电成本：{open ? data?.elec_cost_unit : '*******'}
-                </li>
-              </ul>
-            </div>
-          </Col>
-        </Row>
-        <Row gutter={16}>
-          <Col span={12}>
-            <div className={styles.card2}>
-              <h3>能耗数据</h3>
-              <ul>
-                <li>
-                  <i></i>吨水电耗：{data?.elec_unit}
-                </li>
-                <li>
-                  <i></i>用电量：{data?.elec}
-                </li>
-              </ul>
-            </div>
-          </Col>
-          <Col span={12}>
-            <div className={styles.card2}>
-              <h3>药耗数据</h3>
-              <ul>
-                <li>
-                  <i></i>吨水药耗：{data?.otc_unit}
-                </li>
-                <li>
-                  <i></i>药量：{data?.otc}
-                </li>
-              </ul>
-            </div>
-          </Col>
-        </Row>
       </div>
+      <Row gutter={40}>
+        <Col span={12}>
+          <div className={styles.card}>
+            <h3>进水数据</h3>
+            <ul>
+              <li>
+                <i></i>进水量：{data?.fwa}
+              </li>
+              <li>
+                <i></i>进水温度：{data?.ft}
+              </li>
+              <li>
+                <i></i>进水浊度：{data?.ftur}
+              </li>
+              <li>
+                <i></i>进水压力：{data?.fpp}
+              </li>
+              {/* 与产水数据对其 */}
+              <li style={{ visibility: 'hidden' }}>
+                <i></i>
+              </li>
+            </ul>
+          </div>
+        </Col>
+        <Col span={12}>
+          <div className={styles.card}>
+            <h3>产水数据</h3>
+            <ul>
+              <li>
+                <i></i>外供水流量：{data?.dwa}
+              </li>
+              <li>
+                <i></i>外供水pH：{data?.dph}
+              </li>
+              <li>
+                <i></i>外供水电导率：{data?.dtds}
+              </li>
+              <li>
+                <i></i>外供水浊度：{data?.dtur}
+              </li>
+              <li>
+                <i></i>外供水余氯：{data?.dsan}
+              </li>
+            </ul>
+          </div>
+        </Col>
+        <Col span={12}>
+          <div className={styles.card}>
+            <h3>水厂负荷数据</h3>
+            <ul>
+              <li>
+                <i></i>实际处理水量：{data?.fact_water}
+              </li>
+              <li>
+                <i></i>设计处理水量：{data?.devise_water}
+              </li>
+            </ul>
+          </div>
+        </Col>
+        <Col span={12}>
+          <div className={styles.card2}>
+            <h3>
+              成本数据
+              <div
+                style={{ marginLeft: 14 }}
+                onClick={() => setOpen(!open)}
+                className={`password-eye ${open ? 'open' : ''}`}
+              ></div>
+            </h3>
+            <ul>
+              <li>
+                <i></i>吨水药成本：{open ? data?.otc_cost_unit : '*******'}
+              </li>
+              <li>
+                <i></i>吨水电成本：{open ? data?.elec_cost_unit : '*******'}
+              </li>
+            </ul>
+          </div>
+        </Col>
+      </Row>
+      <Row gutter={16}>
+        <Col span={12}>
+          <div className={styles.card2}>
+            <h3>能耗数据</h3>
+            <ul>
+              <li>
+                <i></i>吨水电耗：{data?.elec_unit}
+              </li>
+              <li>
+                <i></i>用电量：{data?.elec}
+              </li>
+            </ul>
+          </div>
+        </Col>
+        <Col span={12}>
+          <div className={styles.card2}>
+            <h3>药耗数据</h3>
+            <ul>
+              <li>
+                <i></i>吨水药耗：{data?.otc_unit}
+              </li>
+              <li>
+                <i></i>药量：{data?.otc}
+              </li>
+            </ul>
+          </div>
+        </Col>
+      </Row>
+      {/* </div> */}
     </PageContent>
   );
 };

src/pages/SmartReport/index.js

@@ -172,6 +172,8 @@ const SmartReport = () => {
   };
 
   const {
+    ele_65,
+    ele_66,
     electricity,
     in_water,
     maintain_record,
@@ -344,17 +346,12 @@ const SmartReport = () => {
             <div className={styles.smartText}>
               优化条数:{push_optimize_task}条
             </div>
+            <div className={styles.smartText}>超滤能耗：{ele_65}</div>
+            <div className={styles.smartText}>反渗透能耗：{ele_66}</div>
             <div
               ref={workScoreDomRef}
               style={{ height: '340px', margin: '10px 0 10px 0' }}
             ></div>
-            {/* <div className={styles.smartText}>工况分数统计（折线图）</div> */}
-            <div className={styles.smartText}>
-              超滤工况统计（膜寿命、能耗、药耗数据）
-            </div>
-            <div className={styles.smartText}>
-              反渗透工况统计（膜寿命、能耗、药耗数据）
-            </div>
           </div>
           <div className={styles.box}>
             <ModuleTitle title="任务工单" />

src/pages/SmartReport/index.less

@@ -5,7 +5,6 @@
   background: rgba(255, 255, 255, 0.78);
   box-shadow: 0px 0px 8px 4px rgba(212, 212, 212, 0.5);
   border-radius: 20px;
-  opacity: 0.8;
   font-size: 30px;
   font-weight: 400;
   color: #4a4a4a;

src/pages/SystemDaily/index.less

@@ -6,7 +6,6 @@
   background: rgba(255, 255, 255, 0.78);
   box-shadow: 0px 0px 8px 4px rgba(212, 212, 212, 0.5);
   border-radius: 20px;
-  opacity: 0.8;
 }
 .titleContent {
   width: 100%;
@@ -29,7 +28,6 @@
   width: 80%;
   box-shadow: 0px 0px 8px 4px rgba(212, 212, 212, 0.5);
   border-radius: 20px;
-  opacity: 0.8;
   background: #e7f1fe;
   .text {
     margin-bottom: 34px;

src/pages/TaskManage/index.less

@@ -1,7 +1,7 @@
 .taskList {
   border: none;
   max-height: calc(100vh - 140px);
-  overflow-y: scroll;
+  overflow-y: auto;
 
   .listItem {
     margin: 20px 20px 20px 0;