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

src/global.less

@@ -57,6 +57,23 @@ body {
     border-bottom: none !important;
     margin-bottom: 10px;
   }
+  .ant-select-dropdown .ant-select-item {
+    font-size: 26px;
+  }
+  .ant-picker-dropdown {
+    font-size: 24px;
+  }
+  .ant-picker-dropdown .ant-picker-content td {
+    width: 30px;
+  }
+  .ant-picker-dropdown .ant-picker-cell::before {
+    height: 30px;
+  }
+  .ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
+    min-width: 30px;
+    height: 30px;
+    line-height: 30px;
+  }
 }
 
 // Remove list styles on ul, ol
@@ -235,3 +252,13 @@ input[type='reset'] {
 .ant-table-tbody > tr:nth-child(even) {
   background: rgba(145, 192, 238, 0.16);
 }
+
+.ant-picker {
+  font-size: 26px;
+  .ant-picker-input > input {
+    font-size: 24px;
+  }
+  .ant-picker-separator {
+    font-size: 24px;
+  }
+}

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 || {};
@@ -36,7 +39,8 @@ const Center = () => {
           <div className={styles.name}>{user?.CName}</div>
           <div className={styles.photo}>
             手机号：{user?.Mobile}
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;系统版本：
+            <br />
+            系统版本：
             {version}
           </div>
         </div>
@@ -48,6 +52,7 @@ const Center = () => {
             toMyTask(1);
           }}
         >
+          <img src={taskIcon} style={{ marginRight: '20px' }} />
           我的任务
         </div>
         <div
@@ -56,6 +61,7 @@ const Center = () => {
             toMyTask(2);
           }}
         >
+          <img src={orderIcon} style={{ marginRight: '20px' }} />
           我的工单
         </div>
       </div>
@@ -66,7 +72,7 @@ const Center = () => {
         <div className={styles.lineItem} onClick={handleSmartReport}>
           智慧运营报告
         </div>
-        <div className={styles.lineItem}>问题反馈备份</div>
+        <div className={styles.lineItem}>问题反馈</div>
         <div className={styles.lineItem}>个人设置</div>
       </div>
       <div className={styles.loginOut} onClick={handleLogOutClick}>

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;

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' }}

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;
   }
 }

src/pages/TaskManage/components/MandateDetail.js

@@ -116,7 +116,7 @@ const MandateDetail = (props) => {
         setIgnoreModalOpen(true);
         break;
       case 'manual':
-        console.log('manual');
+        UnityAction.sendMsg('menuItem', '工艺监控');
         break;
       case 'auto':
         setAutoHandleModalOpen(true);
@@ -277,8 +277,9 @@ const MandateDetail = (props) => {
           >
             忽略
           </Button>
-          {(record.MandateClass === 1 || record.MandateClass === 2) &&
-            record?.Status === 0 && (
+          {(mandateDetail?.MandateClass?.value === 1 ||
+            mandateDetail?.MandateClass?.value === 2) &&
+            mandateDetail?.Status?.value === 0 && (
               <>
                 <Button
                   className={styles.footerBtn}
@@ -300,7 +301,6 @@ const MandateDetail = (props) => {
                 </Button>
               </>
             )}
-
           <Button
             className={styles.footerBtn}
             shape="round"