ZhaoJun 1 éve
szülő
commit
13203d878c

BIN
src/assets/center/my-task.png


BIN
src/assets/center/my-task@2x.png


BIN
src/assets/center/order.png


BIN
src/assets/center/order@2x.png


+ 5 - 0
src/pages/Center/index.js

@@ -1,9 +1,12 @@
+const taskIcon = require('@/assets/center/my-task.png');
+const orderIcon = require('@/assets/center/order.png');
 import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
 import { version } from '@/constants';
 import { UnityAction } from '@/utils/utils';
 import { useModel, useNavigate, useParams } from '@umijs/max';
 import styles from './index.less';
+
 const Center = () => {
   const { initialState } = useModel('@@initialState');
   const user = initialState?.user || {};
@@ -48,6 +51,7 @@ const Center = () => {
             toMyTask(1);
           }}
         >
+          <img src={taskIcon} style={{ marginRight: '20px' }} />
           我的任务
         </div>
         <div
@@ -56,6 +60,7 @@ const Center = () => {
             toMyTask(2);
           }}
         >
+          <img src={orderIcon} style={{ marginRight: '20px' }} />
           我的工单
         </div>
       </div>

+ 1 - 0
src/pages/Center/index.less

@@ -20,6 +20,7 @@
     height: 150px;
     background-image: url('@/assets/center/profile.png');
     background-size: 100%, 100%;
+    background-repeat: no-repeat;
   }
   .textContent {
     margin-left: 60px;

+ 31 - 25
src/pages/SmartReport/index.js

@@ -259,27 +259,31 @@ const SmartReport = () => {
               {dayjs(date.etime).format('MM月DD日')}
             </div>
           </div>
-          <div>
-            时间:
-            <Select
-              defaultValue="1"
-              style={{ width: 120 }}
-              onChange={handleChange}
-              options={[
-                {
-                  value: '1',
-                  label: '近7天',
-                },
-                {
-                  value: '2',
-                  label: '近30天',
-                },
-                {
-                  value: '3',
-                  label: '自定义时间',
-                },
-              ]}
-            />
+          <div className={styles.headRight}>
+            <div>
+              时间:
+              <Select
+                className={styles.headRightSelect}
+                defaultValue="1"
+                style={{ width: 180 }}
+                onChange={handleChange}
+                popupClassName={styles.headRightSelect}
+                options={[
+                  {
+                    value: '1',
+                    label: '近7天',
+                  },
+                  {
+                    value: '2',
+                    label: '近30天',
+                  },
+                  {
+                    value: '3',
+                    label: '自定义时间',
+                  },
+                ]}
+              />
+            </div>
             <div>{showRange && <RangePicker onChange={onChange} />}</div>
           </div>
         </div>
@@ -355,11 +359,13 @@ const SmartReport = () => {
           </div>
           <div className={styles.box}>
             <ModuleTitle title="智慧运营" />
-            <div className={styles.smartText}>
-              优化条数:{push_optimize_task}条
+            <div style={{ padding: '20px 20px 0 20px' }}>
+              <div className={styles.smartText}>
+                优化条数:{push_optimize_task}条
+              </div>
+              <div className={styles.smartText}>超滤能耗:{ele_65}</div>
+              <div className={styles.smartText}>反渗透能耗:{ele_66}</div>
             </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' }}

+ 17 - 0
src/pages/SmartReport/index.less

@@ -33,7 +33,23 @@
     color: #4a4a4a;
     line-height: 40px;
   }
+  .headRight {
+    font-size: 26px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .headRightSelect :global {
+      .ant-select-selection-item {
+        font-size: 26px;
+      }
+      .ant-select-selector {
+        height: 40px;
+        padding: 4px 11px;
+      }
+    }
+  }
 }
+
 .box {
   margin: 24px 0;
   padding: 38px 30px;
@@ -78,5 +94,6 @@
   }
   .smartText {
     margin-bottom: 18px;
+    font-size: 30px;
   }
 }