xujunjie 1 år sedan
förälder
incheckning
c37852905a

+ 1 - 1
src/components/PageContent/index.less

@@ -8,7 +8,7 @@
     position: absolute;
     top: 26px;
     right: 20px;
-    font-size: 38px;
+    font-size: 34px;
 
     color: #4a4a4a;
     cursor: pointer;

+ 1 - 0
src/components/TabsContent/index.less

@@ -29,6 +29,7 @@
 
 .small {
   height: inherit;
+  padding: 20px 0;
   .tabsItem {
     font-size: 28px;
     padding: 0 30px; 

+ 3 - 3
src/global.less

@@ -115,10 +115,10 @@ input[type='reset'] {
 .password-eye {
   display: inline-block;
   vertical-align: middle;
-  width: 22px;
-  height: 15px;
+  width: 30px;
+  height: 30px;
   background: url('@/assets/icon-eye1.png') no-repeat center;
-  background-size: contain;
+  background-size: 22px 15px;
   &.open {
     background-image: url('@/assets/icon-eye2.png');
   }

+ 6 - 5
src/pages/Home/ChemCostComparison.js

@@ -263,7 +263,7 @@ const CostComparison = (props) => {
         ></div>
       </PageTitle>
 
-      <div className="card-box" style={{ padding: 20, marginTop: 10 }}>
+      <div className="card-box" style={{ padding: 20, marginTop: 40 }}>
         {/* 使用Tabs来展示所有药的标签 */}
         <div className="tabs">
           {chemList?.map((item) => (
@@ -297,17 +297,18 @@ const CostComparison = (props) => {
         {chartData.length !== 0 && (
           <div
             style={{
-              height: '800px',
+              height: '880px',
               display: 'flex',
               flexDirection: 'column',
-              justifyContent: 'space-evenly',
+              justifyContent: 'space-between',
+              padding: "40px 0"
             }}
           >
-            <div style={{ height: '300px' }}>
+            <div style={{ height: '350px' }}>
               <ChartModule {...chartData[0]} />
             </div>
 
-            <div style={{ height: '300px' }}>
+            <div style={{ height: '350px' }}>
               <ChartModule {...chartData[1]} />
             </div>
           </div>

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

@@ -3,12 +3,12 @@ import ChartModule from '@/components/ManagementPage/chartModule';
 import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
 import { getComparisonData } from '@/services/OperationManagement';
+import { UnityAction } from '@/utils/utils';
 import { useParams } from '@umijs/max';
 import { message } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import styles from './manage.less';
-import { UnityAction } from '@/utils/utils';
 
 const typeParams = [
   {
@@ -236,7 +236,6 @@ const CostComparison = () => {
       </PageTitle>
 
       <div className="card-box" style={{ padding: 20, marginTop: 40 }}>
-  
         <div className={styles.curEnergyCost}>
           <div className={styles.item}>
             <div className={styles.value}>
@@ -256,17 +255,18 @@ const CostComparison = () => {
         {chartData.length !== 0 && (
           <div
             style={{
-              height: '800px',
+              height: '920px',
               display: 'flex',
               flexDirection: 'column',
-              justifyContent: 'space-evenly',
+              justifyContent: 'space-between',
+              padding: '60px 0 40px',
             }}
           >
-            <div style={{ height: '300px' }}>
+            <div style={{ height: '350px' }}>
               <ChartModule {...chartData[0]} />
             </div>
 
-            <div style={{ height: '300px' }}>
+            <div style={{ height: '350px' }}>
               <ChartModule {...chartData[1]} />
             </div>
           </div>

+ 1 - 0
src/pages/Home/QualityMng.js

@@ -142,6 +142,7 @@ function Quality() {
             columns={column}
             style={{ marginTop: 20 }}
             dataSource={mainRes?.data}
+            pagination={false}
           />
         </div>
       </div>

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

@@ -88,7 +88,7 @@ const WaterAmtMng = () => {
           数据曲线
         </div>
         <Spin spinning={loading}>
-          <div style={{ height: '300px', marginTop: 20 }}>
+          <div style={{ height: '500px', marginTop: 20 }}>
             <ChartModule yName="水量(t)" xData={xData} dataList={dataList} />
           </div>
         </Spin>

+ 4 - 2
src/pages/Home/index.js

@@ -59,7 +59,9 @@ const SmartWork = (props) => {
         <div className={styles.scoreTitle}>
           当前运行{data?.grade},可继续优化
         </div>
-        <div className={styles.time}>{data?.clac_time}</div>
+        <div className={styles.time}>
+          {dayjs(data?.clac_time).format('YYYY-MM-DD HH:mm')}
+        </div>
       </div>
     </Box>
   );
@@ -145,7 +147,7 @@ const SelfInspection = connect(({ eqSelfInspection, loading }) => ({
 
       <div className={styles.insStatus}>{renderStatus()}</div>
       <div className={styles.time} style={{ marginBottom: 30 }}>
-        {autoReport.CreatedTime}
+        {dayjs(autoReport.CreatedTime).format('YYYY-MM-DD HH:mm')}
       </div>
     </Box>
   );

+ 7 - 7
src/pages/Home/index.less

@@ -22,7 +22,7 @@
   .boxTitle {
     padding-left: 68px;
     margin-bottom: 20px;
-    font-size: 24px;
+    font-size: 26px;
     font-weight: 400;
     color: #ffffff;
     line-height: 34px;
@@ -35,7 +35,7 @@
     }
   }
   .name {
-    font-size: 20px;
+    font-size: 22px;
     font-weight: 400;
     color: #ffffff;
     line-height: 28px;
@@ -57,18 +57,18 @@
   align-items: center;
 
   .scoreTitle {
-    font-size: 22px;
+    font-size: 24px;
     margin-top: 10px;
     margin-bottom: 14px;
   }
   .grade {
-    font-size: 20px;
+    font-size: 22px;
     margin-top: 10px;
   }
 }
 
 .time {
-  font-size: 20px;
+  font-size: 22px;
   margin-bottom: 20px;
   text-align: center;
 }
@@ -83,14 +83,14 @@
   text-align: center;
   line-height: 50px;
 
-  font-size: 24px;
+  font-size: 26px;
   font-weight: 400;
   color: #ffffff;
 }
 
 .insStatus {
   text-align: center;
-  font-size: 40px;
+  font-size: 42px;
   font-weight: 500;
   color: #f5a623;
   line-height: 56px;

+ 1 - 1
src/pages/Smart/ConditionDetection.js

@@ -221,7 +221,7 @@ const ChartContent = ({ projectId }) => {
   return (
     <div className={`${styles.card} card-box`}>
       <div className={styles.title}>近一日工况统计</div>
-      <div ref={domRef} style={{ height: '40vh' }}></div>
+      <div ref={domRef} style={{ height: '38vh' }}></div>
     </div>
   );
 };

+ 3 - 2
src/pages/Smart/components/SimulateDetail.js

@@ -88,10 +88,11 @@ const SimulateDetail = (props) => {
   });
 
   return (
-    <div>
+    <div style={{ marginTop: 10 }}>
       {data && (
         <TabsContent
           center={false}
+          small
           defaultActiveKey={data[0]}
           items={data.map((item) => ({
             label: TYPE[item]?.name,
@@ -546,7 +547,7 @@ function getOption(data = [], active) {
         // color: '#fff',
         fontSize: 24,
       },
-      type: 'scroll'
+      type: 'scroll',
     },
     grid: {
       top: 80,

+ 6 - 1
src/pages/Smart/components/SimulateDetail.less

@@ -106,6 +106,11 @@
     }
   }
 }
+:global {
+  .ant-select-dropdown .ant-select-item {
+    font-size: 24px !important;
+  }
+}
 
 .chartBoxTop {
   display: flex;
@@ -164,4 +169,4 @@
     padding-left: 20px;
     margin-bottom: 10px;
   }
-}
+}

+ 6 - 3
src/pages/Smart/index.js

@@ -3,6 +3,7 @@ import PageTitle from '@/components/PageTitle';
 import { queryConditionSnapshot } from '@/services/SmartOps';
 import { history, useParams, useRequest } from '@umijs/max';
 import { Button, Col, Row } from 'antd';
+import dayjs from 'dayjs';
 import { useState } from 'react';
 import CircleScore from './components/CircleScore';
 import styles from './index.less';
@@ -26,10 +27,12 @@ const Work = (props) => {
         </CircleScore>
         <div className={styles.scoreRight}>
           <h3>当前运行{data?.grade},可继续优化</h3>
-          <div className={styles.time}>{data?.clac_time}</div>
+          <div className={styles.time}>
+            {dayjs(data?.clac_time).format('YYYY-MM-DD HH:mm')}
+          </div>
           {data?.score && (
             <Button
-              style={{ marginRight: 20}}
+              style={{ marginRight: 20 }}
               className={styles.btn}
               type="primary"
               onClick={() =>
@@ -53,7 +56,7 @@ const Work = (props) => {
           </Button>
         </div>
       </div>
-      <Row gutter={16}>
+      <Row gutter={40}>
         <Col span={12}>
           <div className={styles.card}>
             <h3>进水数据</h3>

+ 8 - 9
src/pages/Smart/index.less

@@ -1,10 +1,9 @@
 .score {
-  margin: 20px 0;
+  margin: 40px 0 52px;
   // color: #fff;
   display: flex;
   align-items: center;
   padding-left: 60px;
-  margin-bottom: 52px;
 }
 
 .scoreRight {
@@ -34,17 +33,17 @@
 
 .card {
   border-radius: 8px;
-  box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 0.3);
-  padding: 16px;
+  box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
+  padding: 24px 20px;
   border: 1px solid #eee;
-  margin: 10px 0;
   background: rgb(255, 255, 255);
+  margin-bottom: 40px;
 
   h3 {
-    font-size: 28px;
+    font-size: 30px;
     color: #4a4a4a;
     line-height: 38px;
-    margin-bottom: 12px;
+    margin-bottom: 26px;
     font-weight: bold;
   }
 
@@ -54,8 +53,8 @@
     padding-bottom: 10px;
 
     li {
-      margin-bottom: 16px;
-      font-size: 24px;
+      margin-bottom: 20px;
+      font-size: 26px;
       font-weight: 400;
       color: #4a4a4a;
       line-height: 30px;