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

src/components/ManagementPage/index.less

@@ -1,12 +1,12 @@
 .icon {
   float: left;
-  width: 4px;
-  height: 30px;
-  margin: 7px 0;
+  width: 7px;
+  height: 32px;
+  margin: 4px 0;
   background-color: #366cda;
 }
 .title {
-  padding-left: 8px;
+  padding-left: 12px;
   font-size: 30px;
   font-weight: 400;
   color: #4a4a4a;

src/components/PageContent/index.less

@@ -6,9 +6,9 @@
 
   .close {
     position: absolute;
-    top: 22px;
+    top: 26px;
     right: 20px;
-    font-size: 28px;
+    font-size: 38px;
 
     color: #4a4a4a;
     cursor: pointer;

src/components/PageTitle/index.js

@@ -14,12 +14,10 @@ export default (props) => {
   };
 
   return (
-    <div
-      className={`${styles.titleBox} ${tabs ? styles.tabs : ''}`}
-      onClick={handleOnClick}
-    >
+    <div className={`${styles.titleBox} ${tabs ? styles.tabs : ''}`}>
       {returnable || onReturn ? (
         <LeftOutlined
+          onClick={handleOnClick}
           style={{ fontSize: 36, cursor: 'pointer', marginRight: '40px' }}
         />
       ) : (

src/components/PageTitle/index.less

@@ -3,8 +3,8 @@
   align-items: center;
 }
 .titleBar {
-  width: 5px;
-  height: 26px;
+  width: 7px;
+  height: 35px;
   background: #4a90e2;
   float: left;
   margin-right: 18px;

src/components/TabsContent/index.js

@@ -2,7 +2,13 @@ import { useMemo, useState } from 'react';
 import styles from './index.less';
 
 const TabsContent = (props) => {
-  const { defaultActiveKey = '1', center = true, items = {}, onChange } = props;
+  const {
+    defaultActiveKey = '1',
+    center = true,
+    small = false,
+    items = {},
+    onChange,
+  } = props;
   const [active, setActive] = useState(defaultActiveKey);
   const renderContent = useMemo(() => {
     return items.find((item) => item.key == active)?.children;
@@ -10,7 +16,7 @@ const TabsContent = (props) => {
   return (
     <div>
       <div
-        className={styles.tabsTitle}
+        className={`${styles.tabsTitle} ${small ? styles.small : ''}`}
         style={center ? { justifyContent: 'center' } : {}}
       >
         {items.map((item) => (

src/components/TabsContent/index.less

@@ -3,6 +3,13 @@
   align-items: center;
   height: 116px;
   margin-bottom: 10px;
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+
   > .tabsItem {
     border-right: 1px solid #979797;
   }
@@ -14,7 +21,19 @@
   padding: 0 40px;
   color: #4a4a4a;
   font-size: 36px;
+  white-space: nowrap;
 }
 .active {
   color: #4a90e2;
 }
+
+.small {
+  height: inherit;
+  .tabsItem {
+    font-size: 28px;
+    padding: 0 30px; 
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+}

src/components/ThresholdDetail/index.less

@@ -4,7 +4,7 @@
 }
 
 .success {
-  background-color: #60FE76;
+  background-color: #12CEB3;
   width: 300%;
   height: 100%;
   position: absolute;
@@ -15,9 +15,9 @@
 
 .box {
   width: 100%;
-  height: 6px;
+  height: 8px;
   position: relative;
-  background-color: #60FE76;
+  background-color: #12CEB3;
 
   .exception,
   .breakdown {
@@ -27,12 +27,12 @@
 
   .breakdown {
     z-index: 2;
-    background-color: #D45C41;
+    background-color: #FE5850;
   }
 
   .exception {
     z-index: 1;
-    background-color: #FFE26D;
+    background-color: #F5A623;
   }
 
   
@@ -61,7 +61,7 @@
   position: absolute;
   top: 18px;
   line-height: 1.2;
-  font-size: 16px;
+  font-size: 24px;
   word-break: keep-all;
   transform: translateX(-50%);
 

src/global.js

@@ -0,0 +1,8 @@
+import { GetTokenFromUrl, storeToken } from '@/utils/utils';
+
+const token = GetTokenFromUrl();
+
+if (token) {
+  storeToken(token);
+  console.log(token);
+}

src/models/eqSelfInspection.js

@@ -14,7 +14,9 @@ import {
 export default {
   namespace: 'eqSelfInspection',
   state: {
-    autoReport: {},
+    autoReport: {
+      warningTotalNum: 0,
+    },
     patrolList: [],
     mandateInfo: [],
   },

src/pages/Controller/Device.js

@@ -27,28 +27,21 @@ function Hardware() {
 
       <Spin spinning={loading}>
         {data?.list?.map((item) => (
-          <div key={item.id} className={`card-box ${styles.item}`}>
-            <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>
-            {item.name}
+          <div
+            key={item.id}
+            className={`card-box ${styles.item}`}
+            style={{ justifyContent: 'space-between' }}
+          >
+            <div>
+              <i className={`${styles.icon} `}></i>
+              {item.name}
+            </div>
+
             <div>
               <div>定位</div>
-              {/* <div>历史轨迹</div> */}
             </div>
           </div>
         ))}
-
-        <div
-          className={`card-box ${styles.item}`}
-          style={{ justifyContent: 'space-between' }}
-        >
-          <div>
-            <i className={`${styles.icon}`}></i>
-            设备1
-          </div>
-          <div>
-            <div>定位</div>
-          </div>
-        </div>
       </Spin>
     </PageContent>
   );

src/pages/Controller/Hardware.js

@@ -6,15 +6,20 @@ import AirConditioner from './components/AirConditioner';
 import Light from './components/Light';
 
 function Hardware() {
-  const handleTabsChange = (tab) => {};
+  const handleTabsChange = (tab) => {
+    // UnityAction.sendMsg(tab == '1' ? 'ACData' : 'lightData');
+  };
+
+  // useEffect(() => {
+  //   UnityAction.sendMsg('ACData');
+  // }, []);
+
   return (
-    <PageContent tabs>
+    <PageContent closeable={false}>
       <PageTitle
         tabs
         onReturn={() => UnityAction.sendMsg('menuItem', '智能管控')}
-      >
-        感知监控
-      </PageTitle>
+      ></PageTitle>
       <TabsContent
         defaultActiveKey="1"
         onChange={handleTabsChange}

src/pages/Controller/components/AirConditioner.js

@@ -2,12 +2,16 @@ import { queryIotList } from '@/services/controller';
 import { useParams, useRequest } from '@umijs/max';
 import { Spin } from 'antd';
 import styles from '../index.less';
+import { UnityAction } from '@/utils/utils';
 
 const Work = (props) => {
   const { projectId } = useParams();
 
   const { data, loading } = useRequest(queryIotList, {
     defaultParams: [projectId],
+    onSuccess(res) {
+      UnityAction.sendMsg('ACData', res.list);
+    },
   });
 
   const getIconStatus = (status) => {

src/pages/Controller/components/Light.js

@@ -2,12 +2,16 @@ import { queryLightList } from '@/services/controller';
 import { useParams, useRequest } from '@umijs/max';
 import { Spin } from 'antd';
 import styles from '../index.less';
+import { UnityAction } from '@/utils/utils';
 
 const Work = (props) => {
   const { projectId } = useParams();
 
   const { data, loading } = useRequest(queryLightList, {
     defaultParams: [projectId],
+    onSuccess(res) {
+      UnityAction.sendMsg('lightData', res.list);
+    },
   });
 
   const getIconStatus = (status) => {

src/pages/EqSelfInspection/List/index.js

@@ -11,62 +11,6 @@ function List(props) {
 
   const { projectId } = useParams();
 
-  const getColumns = () => {
-    return [
-      {
-        title: '自检时间',
-        dataIndex: 'CreatedTime',
-        width: '26%',
-        render: (text) => {
-          return text ? dayjs(text).format('YYYY-MM-DD HH:mm') : null;
-        },
-      },
-      {
-        title: '工艺段',
-        width: '24%',
-        render: (record) => {
-          const name = processList?.find(
-            (item) => item.group_id == record?.RouteInfo?.GroupID,
-          )?.name;
-          return name || '-';
-        },
-      },
-      {
-        title: '状态',
-        width: '10%',
-        dataIndex: 'Status',
-        render: (text) => {
-          return text == 0 ? (
-            '正常'
-          ) : (
-            <div style={{ color: '#FF8600' }}>异常</div>
-          );
-        },
-      },
-      {
-        title: '操作',
-        width: '16%',
-        render: (text, record) => {
-          return (
-            <Fragment>
-              {
-                <>
-                  <a
-                    onClick={(e) => {
-                      goToDetail(record, e);
-                    }}
-                  >
-                    详情
-                  </a>
-                </>
-              }
-            </Fragment>
-          );
-        },
-      },
-    ];
-  };
-
   const goToDetail = (record) => {
     UnityAction.sendMsg('reportDetail', '');
     history.push(

src/pages/EqSelfInspection/List/index.less

@@ -1,24 +1,25 @@
 .list {
   margin-top: 40px;
   .item {
-    padding: 94px 20px 56px;
+    padding: 28px 75px 28px 124px;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 14px;
+    margin-bottom: 18px;
     background: #ffffff;
     box-shadow: 0px 0px 8px 14px rgba(0, 0, 0, 0.03);
-    border-radius: 8px;
+    border-radius: 12px;
     align-items: center;
   }
   .status {
-    width: 100px;
-    height: 100px;
-    font-size: 26px;
+    width: 134px;
+    height: 134px;
+    font-size: 36px;
     font-weight: 400;
     color: #000000;
     text-align: center;
-    line-height: 100px;
+    line-height: 134px;
     background: url('@/assets/circle-success.png') no-repeat center;
+    background-size: 100% 100%;
   }
   .statusError {
     background-image: url('@/assets/circle-error.png');
@@ -27,42 +28,43 @@
     flex: 1;
     padding-left: 100px;
     i {
-      width: 10px;
-      height: 10px;
+      width: 14px;
+      height: 14px;
       display: inline-block;
       vertical-align: middle;
       border-radius: 50%;
-      margin-right: 10px;
+      margin-right: 14px;
       background-color: rgba(74, 144, 226, 1);
     }
   }
   .time {
-    font-size: 18px;
+    font-size: 24px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 24px;
+    line-height: 34px;
   }
   .desc {
-    font-size: 24px;
+    font-size: 32px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 34px;
+    line-height: 44px;
     .number {
-      font-size: 40px;
+      font-size: 54px;
       font-weight: 500;
       color: #f5a623;
-      line-height: 56px;
-      margin-left: 8px;
+      line-height: 76px;
+      margin-left: 12px;
     }
 
     span {
-      font-size: 22px;
+      font-size: 28px;
       color: #000000;
     }
   }
   .btn {
-    width: 17px;
-    height: 26px;
+    width: 23px;
+    height: 35px;
     background: url('@/assets/arr-right.png') no-repeat center;
+    background-size: 100% 100%;
   }
 }

src/pages/EqSelfInspection/Statistics.js

@@ -140,7 +140,7 @@ const Statistics = (props) => {
   return (
     <PageContent closeable={false}>
       <PageTitle returnable>系统自检统计</PageTitle>
-      <div className={`${styles.itemMain2} card-box`} style={{padding: '40px 0'}}>
+      <div className={`${styles.itemMain2} card-box`} style={{padding: '44px 0'}}>
         <div style={{ display: 'flex' }}>
           {overviewData?.map((item) => (
             <Text num={item.num} label={item.label} />

src/pages/EqSelfInspection/components/Detail.js

@@ -1,3 +1,5 @@
+import ModuleTitle from '@/components/ManagementPage/moduleTitle';
+import TabsContent from '@/components/TabsContent';
 import ThresholdDetail from '@/components/ThresholdDetail';
 import ThresholdModal from '@/components/ThresholdDetail/ThresholdModal';
 import { changeRecordStatus, getDumuDetail } from '@/services/eqSelfInspection';
@@ -13,7 +15,6 @@ import {
   Select,
   Spin,
   Table,
-  Tabs,
   message,
 } from 'antd';
 import dayjs from 'dayjs';
@@ -102,6 +103,13 @@ function Detail(props) {
   return (
     <Spin spinning={loading} wrapperClassName="card-box">
       <div className={styles.card}>
+        <div
+          className={`${styles.orderIcon} ${
+            data.warningTotalNum ? styles.error : ''
+          }`}
+        >
+          {data.warningTotalNum == 0 ? '正常' : '异常'}
+        </div>
         <Row>
           <Col span={24} className={styles.cardText}>
             自检时间：{data?.CreatedTime}
@@ -138,11 +146,7 @@ function Detail(props) {
           key="extend"
           type={'extend'}
           userList={userList}
-          title={
-            <div>
-              <div className={styles.tableTitle}>设备自检报告</div>
-            </div>
-          }
+          title={<ModuleTitle title="设备自检报告" />}
         ></ReportCom>
 
         {/* 工艺自检报告"> */}
@@ -150,7 +154,7 @@ function Detail(props) {
           <div className={styles.tableStatus}>
             异常({data?.FaultAnalysis?.length || 0})
           </div>
-          <div className={styles.tableTitle2}>工艺自检报告</div>
+          <ModuleTitle title="工艺自检报告" />
 
           <AalysisTable
             onClickItem={sendMessageToUnity}
@@ -160,7 +164,6 @@ function Detail(props) {
         </div>
         {/* 安全隐患自检报告"> */}
         <div className={styles.content}>
-          <div className={styles.tableTitle2}>安全隐患自检报告</div>
           {/* 环境异常 */}
           <ReportCom
             sendMessageToUnity={sendMessageToUnity}
@@ -171,17 +174,13 @@ function Detail(props) {
             key="sensor"
             type={'sensor'}
             userList={userList}
-            title={
-              <div style={{ color: '#1677ff', fontSize: 22 }}>环境异常</div>
-            }
+            title={<ModuleTitle title="环境异常" />}
           ></ReportCom>
 
           {/* 安防检测异常 */}
           <ReportDumCom
             data={dumuList}
-            title={
-              <div style={{ color: '#1677ff', fontSize: 22 }}>安防检测异常</div>
-            }
+            title={<ModuleTitle title="安防检测异常" />}
           />
 
           {/* 电器检测异常 */}
@@ -193,9 +192,7 @@ function Detail(props) {
             key="extend"
             type={'extend'}
             userList={userList}
-            title={
-              <div style={{ color: '#1677ff', fontSize: 22 }}>电气检测异常</div>
-            }
+            title={<ModuleTitle title="电气检测异常" />}
           ></ReportCom>
 
           {/* 密闭空间检测异常 */}
@@ -207,11 +204,7 @@ function Detail(props) {
             key="extend"
             type={'extend'}
             userList={userList}
-            title={
-              <div style={{ color: '#1677ff', fontSize: 22 }}>
-                密闭空间检测异常
-              </div>
-            }
+            title={<ModuleTitle title="密闭空间检测异常" />}
           ></ReportCom>
         </div>
       </div>
@@ -358,7 +351,7 @@ export function DeviceTable(props) {
       width: '12%',
       render: (record) =>
         record.Status == 1 && (
-          <a style={{ color: '#7BFFFB' }} onClick={() => onClickError(record)}>
+          <a style={{ color: '#FE5850' }} onClick={() => onClickError(record)}>
             异常处理
           </a>
         ),
@@ -668,7 +661,7 @@ export function WarningTable(props) {
       width: '12%',
       render: (record) =>
         record.Status == 1 && (
-          <a style={{ color: '#7BFFFB' }} onClick={() => onClickError(record)}>
+          <a style={{ color: '#FE5850' }} onClick={() => onClickError(record)}>
             异常处理
           </a>
         ),
@@ -689,7 +682,6 @@ export function WarningTable(props) {
         locale={{
           emptyText: <Empty />,
         }}
-     
       />
       <ThresholdModal
         open={visible}
@@ -725,20 +717,23 @@ function ReportCom(props) {
     <div className={styles.detailCard}>
       <div className={styles.tableTop}>
         {title}
-        <Tabs
-          style={{ float: 'right' }}
+        <TabsContent
           defaultActiveKey="1"
           onChange={handleTabsChange}
-        >
-          <Tabs.TabPane
-            tab={`异常/警告(${waringData.length || 0})`}
-            key="1"
-          ></Tabs.TabPane>
-          <Tabs.TabPane
-            tab={`全部(${allData.length || 0})`}
-            key="2"
-          ></Tabs.TabPane>
-        </Tabs>
+          small={true}
+          items={[
+            {
+              key: '1',
+              label: `异常/警告(${waringData.length || 0})`,
+              children: <div></div>,
+            },
+            {
+              key: '2',
+              label: `全部(${allData.length || 0})`,
+              children: <div></div>,
+            },
+          ]}
+        ></TabsContent>
       </div>
 
       {activeKey == '1' && (
@@ -812,10 +807,8 @@ function ReportDumCom(props) {
   return (
     <div>
       <div className={styles.tabBarExtraContent}>
-        <div className={styles.text} style={{ height: 52, width: '60%' }}>
-          <>
-            <div>{title}</div>
-          </>
+        <div className={styles.text} style={{ width: '60%' }}>
+          {title}
         </div>
         <div className={styles.abnormal}>
           <div className={styles.text} style={{ float: 'right' }}>

src/pages/EqSelfInspection/components/PatrolReportDetail.less

@@ -36,7 +36,7 @@
   width: 50%;
   .text {
     color: #1677ff;
-    font-size: 18px;
+    font-size: 28px;
   }
 }
 .tabBarExtraContent {
@@ -55,10 +55,28 @@
 }
 .card {
   background: #eff5fc;
+  padding: 10px 20px;
+  position: relative;
+  overflow: hidden;
+  .orderIcon {
+    background: #4a90e2;
+    width: 300px;
+    position: absolute;
+    top: 40px;
+    right: -92px;
+    text-align: center;
+    font-size: 24px;
+    transform: rotate(45deg);
+    padding: 10px 0;
+    color: #fff;
+    &.error {
+      background: #fe5850;
+    }
+  }
 }
 .cardText {
   padding: 20px;
-  font-size: 20px;
+  font-size: 28px;
 }
 .tableTitle {
   position: absolute;
@@ -73,8 +91,8 @@
   margin-bottom: 10px;
 }
 .tableStatus {
-  color: #1677ff;
-  font-size: 18px;
+  color: #4a90e2;
+  font-size: 28px;
   position: absolute;
   right: 10px;
 }
@@ -96,7 +114,7 @@
   }
   .ant-table-thead > tr > th,
   .ant-table-tbody > tr > td {
-    padding: 8px !important;
-    font-size: 22px;
+    padding: 16px 12px !important;
+    font-size: 24px;
   }
-}
+}

src/pages/EqSelfInspection/index.js

@@ -115,7 +115,7 @@ const EqSelfInspection = (props) => {
           className={`${styles.itemMain} card-box`}
           style={{ padding: '15px 24px' }}
         >
-          <div style={{ fontSize: 28, color: 'rgba(110, 110, 110, 1)' }}>
+          <div style={{ fontSize: 28, color: 'rgb(110, 110, 110)' }}>
             自检间隔：{autoReport?.RouteInfo?.PlanDur}h
           </div>
 
@@ -142,13 +142,13 @@ const EqSelfInspection = (props) => {
               <div
                 style={{
                   color:
-                    autoReport?.warningTotalNum === 0
+                    autoReport?.warningTotalNum == 0
                       ? '#333'
                       : 'rgba(254, 88, 80, 1)',
                   margin: '0 6px',
                 }}
               >
-                {autoReport?.warningTotalNum === 0
+                {autoReport?.warningTotalNum == 0
                   ? '暂无'
                   : autoReport?.warningTotalNum + '项异常'}
               </div>
@@ -171,18 +171,7 @@ const EqSelfInspection = (props) => {
         </div>
         <Item name="设备自检" status={patrolStatus}></Item>
         <Item name="工艺自检" status={faultAnalysisStatus}></Item>
-        <Item
-          name="安全自检"
-          warningText={
-            secureStatus === 1
-              ? `共发现${
-                  secureChildren?.filter((item) => item.status === 1)?.length ||
-                  0
-                }项异常`
-              : ''
-          }
-          status={secureStatus}
-        >
+        <Item name="安全自检" status={secureStatus}>
           {secureChildren?.map((item) => (
             <WarningItem label={item.label} status={item.status} />
           ))}
@@ -263,9 +252,9 @@ const Item = (props) => {
   };
   return (
     <div className={`${styles.itemMain} card-box`}>
-      <div className={styles.item} style={{ height: children ? 60 : '' }}>
+      <div className={styles.item} style={{ height: children ? 80 : '' }}>
         <span className={styles.itemName}>{name}</span>
-        <span className={styles.warningText}>{warningText}</span>
+        {/* <span className={styles.warningText}>{warningText}</span> */}
         {renderRight(status)}
       </div>
       {children}

src/pages/EqSelfInspection/index.less

@@ -29,18 +29,18 @@
     margin-bottom: 6px;
   }
   .logoTitle {
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #6e6e6e;
-    line-height: 28px;
+    line-height: 38px;
     display: flex;
   }
   .logoTime {
-    font-size: 16px;
+    font-size: 22px;
     font-weight: 400;
     color: #6e6e6e;
-    line-height: 22px;
-    margin-top: 6px;
+    line-height: 28px;
+    margin-top: 10px;
   }
   .logoFont {
     position: absolute;
@@ -48,15 +48,16 @@
     align-items: center;
     right: 0;
     bottom: 0;
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #6e6e6e;
-    line-height: 28px;
+    line-height: 38px;
     .iconSetting {
-      margin-left: 8px;
-      width: 20px;
-      height: 20px;
+      margin-left: 10px;
+      width: 28px;
+      height: 28px;
       background: url('@/assets/icon-setting.png') no-repeat;
+      background-size: 100% 100%;
     }
   }
 }
@@ -68,37 +69,37 @@
   margin-top: 20px;
   :global {
     .ant-btn-primary {
-      font-size: 20px;
-      width: 158px;
-      height: 40px;
+      font-size: 24px;
+      width: 140px;
+      height: 46px;
       cursor: pointer;
     }
   }
 }
 .item {
-  height: 80px;
+  height: 108px;
   display: flex;
   align-items: center;
   position: relative;
-  padding: 0 20px;
+  padding: 0 30px;
   .right {
     position: absolute;
     right: 0;
-    margin-right: 10px;
-    font-size: 20px;
+    margin-right: 30px;
+    font-size: 28px;
   }
   .warningText {
     margin-left: 40px;
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #fe5850;
-    line-height: 28px;
+    line-height: 38px;
   }
   .itemName {
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 500;
     color: #4a4a4a;
-    line-height: 28px;
+    line-height: 38px;
     font-weight: bold;
   }
 }
@@ -107,30 +108,31 @@
 }
 .warningItem {
   // border-bottom: 2px solid #555;
-  height: 60px;
+  height: 90px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 20px;
+  padding: 0 30px;
   border-bottom: 1px solid rgba(219, 219, 219, 1);
   &:last-child {
     border-bottom: none;
   }
   span {
-    font-size: 20px;
+    font-size: 28px;
   }
 }
 .iconSuccess {
-  width: 28px;
-  height: 22px;
+  width: 38px;
+  height: 30px;
   background: url('@/assets/icon-success.png') no-repeat;
+  background-size: 100% 100%;
 }
 .reportBtn {
   margin-top: 40px;
   width: 100%;
-  height: 70px;
+  height: 86px;
   display: block;
-  font-size: 22px;
+  font-size: 30px;
   font-weight: 400;
   color: #ffffff;
 }
@@ -152,16 +154,17 @@
   justify-content: center;
   align-items: center;
   flex: 1;
-  font-size: 26px;
   .num {
     color: #f5af3a;
-    font-size: 30px;
-    margin-bottom: 14px;
+    font-size: 40px;
+    margin-bottom: 8px;
     font-weight: bold;
     letter-spacing: 2px;
+    line-height: 56px;
   }
   .label {
     color: #555;
+    font-size: 24px;
   }
 }
 .dialogBtns {

src/pages/Smart/ConditionDetection.js

@@ -49,7 +49,7 @@ const ConditionDetection = (props) => {
     <PageContent closeable={false}>
       <PageTitle returnable>工况检测</PageTitle>
       <div className={styles.circle}>
-        <CircleScore>
+        <CircleScore big>
           <span className={styles.circleText}>{score}</span>
         </CircleScore>
         {/* <p>{desc}</p> */}
@@ -57,7 +57,7 @@ const ConditionDetection = (props) => {
       </div>
       <div className={styles.content}>
         <Row gutter={16}>
-          <Col span={12} style={{ padding: 10 }}>
+          <Col span={12} style={{ padding: 22 }}>
             <div className={`${styles.card} card-box`}>
               <h3>
                 实时工况 <span>{real.score}分</span>
@@ -81,7 +81,7 @@ const ConditionDetection = (props) => {
               </ul>
             </div>
           </Col>
-          <Col span={12} style={{ padding: 10 }}>
+          <Col span={12} style={{ padding: 22 }}>
             <div className={`${styles.card2} card-box`}>
               <h3>
                 目标工况 <span>{best.score}分</span>

src/pages/Smart/ConditionDetection.less

@@ -1,30 +1,31 @@
 .card {
   background-size: 100% 100%;
-  border-radius: 8px;
-  padding: 10px 20px;
+  border-radius: 14px;
+  padding: 14px 20px;
   margin: 10px 0;
   box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
   h3 {
-    margin-bottom: 10px;
+    margin-bottom: 30px;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 500;
     color: #4a4a4a;
-    line-height: 28px;
+    line-height: 40px;
     span {
-      font-size: 24px;
+      font-size: 32px;
       color: #4a90e2;
     }
   }
   ul {
     margin: 0px;
+    margin-bottom: 10px;
     padding: 0;
-    padding-left: 40px;
+    padding-left: 30px;
     li {
-      margin-bottom: 10px;
-      font-size: 20px;
+      margin-bottom: 14px;
+      font-size: 23px;
       &:last-child {
         margin-bottom: 0;
       }
@@ -33,11 +34,11 @@
 
   i {
     display: inline-block;
-    width: 10px;
-    height: 10px;
+    width: 14px;
+    height: 14px;
     background-color: #4a90e2;
     border-radius: 50%;
-    margin-right: 8px;
+    margin-right: 12px;
   }
 }
 
@@ -53,9 +54,10 @@
 .content {
   position: relative;
   .img {
-    width: 58px;
-    height: 103px;
+    width: 78px;
+    height: 138px;
     background: url('~@/assets/vs.png') no-repeat;
+    background-size: 100% 100%;
     position: absolute;
     top: 50%;
     left: 50%;
@@ -69,11 +71,11 @@
   // color: #fff;
   font-size: 24px;
   p {
-    margin-top: 10px;
-    font-size: 22px;
+    margin-top: 14px;
+    font-size: 30px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 30px;
+    line-height: 40px;
   }
 }
 .circleText {

src/pages/Smart/OptimizationTasks.js

@@ -99,7 +99,7 @@ const Produce = ({ projectId, queryMandate }) => {
   });
 
   return (
-    <div style={{ marginBottom: 20 }}>
+    <div style={{ marginBottom: 30 }}>
       <h3 className={styles.title}>
         <i />
         生产调度类
@@ -180,9 +180,11 @@ const Cost = ({ projectId }) => {
   });
   return (
     <div>
-      <h3 className={styles.title}>
-        <i style={{ background: '#F5A623' }} />
-        成本节约类
+      <h3 className={styles.title} style={{ justifyContent: 'space-between' }}>
+        <div>
+          <i style={{ background: '#F5A623' }} />
+          成本节约类
+        </div>
         <div
           className={styles.btn}
           onClick={() => history.push(`/smart/simulate/${projectId}`)}

src/pages/Smart/OptimizationTasks.less

@@ -1,20 +1,22 @@
 .title {
-  font-size: 24px;
-  margin-bottom: 14px;
+  font-size: 32px;
+  margin-bottom: 16px;
   font-weight: bold;
-  line-height: 40px;
+  line-height: 44px;
+  display: flex;
+  align-items: center;
   i {
     display: inline-block;
     vertical-align: middle;
-    width: 12px;
-    height: 12px;
+    width: 14px;
+    height: 14px;
     border-radius: 50%;
     background-color: #4a90e2;
     margin-right: 10px;
   }
 }
 .desc {
-  font-size: 22px;
+  font-size: 30px;
   font-weight: 400;
   color: #4a4a4a;
 }
@@ -24,9 +26,9 @@
   padding: 20px;
   align-items: center;
   .left {
-    width: 90px;
+    width: 150px;
     margin: 0;
-    font-size: 18px;
+    font-size: 24px;
     font-weight: 400;
     color: #3b3b3b;
   }
@@ -36,20 +38,20 @@
 }
 .orderIcon {
   background: #12ceb3;
-  width: 200px;
+  width: 300px;
   position: absolute;
-  top: 30px;
-  right: -55px;
+  top: 40px;
+  right: -92px;
   text-align: center;
-  font-size: 18px;
+  font-size: 24px;
   transform: rotate(45deg);
-  padding: 8px 0;
+  padding: 10px 0;
   color: #fff;
 }
 .pageCard {
   margin-top: 30px;
   overflow: hidden;
-  border-radius: 8px;
+  border-radius: 26px;
   box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 0.3);
   border: 1px solid #eee;
   position: relative;
@@ -57,27 +59,26 @@
 }
 .bottom {
   border-top: 1px solid #c0c0c0;
-  padding: 28px;
+  padding: 38px;
   height: 100%;
   .bottomText {
-    font-size: 18px;
+    font-size: 24px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 24px;
+    line-height: 34px;
     text-align: center;
   }
 }
 .btn {
-  width: 90px;
-  height: 40px;
+  width: 120px;
+  height: 56px;
   background: rgba(245, 166, 35, 0.75);
-  border-radius: 4px;
-  font-size: 18px;
+  border-radius: 5px;
+  font-size: 24px;
   font-weight: 400;
   color: #ffffff;
-  line-height: 40px;
+  line-height: 56px;
   text-align: center;
-  float: right;
 }
 .table2 {
   :global {

src/pages/Smart/components/CircleScore.js

@@ -1,10 +1,10 @@
 import styles from './CircleScore.less';
 
-const CircleScore = ({ score, children }) => {
+const CircleScore = ({ score, children, big = false }) => {
   const normalizedScore = Math.min(Math.max(score, 0), 100);
 
   return (
-    <div className={styles.circleScore}>
+    <div className={`${styles.circleScore} ${big ? styles.big : ''}`}>
       <div className={styles.circle}></div>
       <div className={styles.text}>{children}</div>
     </div>

src/pages/Smart/components/CircleScore.less

@@ -3,6 +3,13 @@
   height: 174px;
   position: relative;
 }
+.big {
+  width: 194px;
+  height: 194px;
+  .circle {
+    mask: radial-gradient(transparent, transparent 78px, #000 78px);
+  }
+}
 
 .circle {
   width: 100%;
@@ -10,7 +17,7 @@
   border-radius: 50%;
   animation: rotation 4s linear infinite;
   background: linear-gradient(60deg, #36a5ed 0%, #6eee96 100%);
-  mask: radial-gradient(transparent, transparent 75px, #000 77px)
+  mask: radial-gradient(transparent, transparent 75px, #000 77px);
 }
 
 .text {

src/pages/Smart/components/SimulateDetail.js

@@ -91,6 +91,7 @@ const SimulateDetail = (props) => {
     <div>
       {data && (
         <TabsContent
+          center={false}
           defaultActiveKey={data[0]}
           items={data.map((item) => ({
             label: TYPE[item]?.name,
@@ -285,7 +286,7 @@ const DeviceList = (props) => {
       value={current?.device_code}
     >
       {data?.list.map((item) => (
-        <Option key={item.device_code}>{item.device_code}</Option>
+        <Select.Option key={item.device_code}>{item.device_code}</Select.Option>
       ))}
     </Select>
   );
@@ -543,7 +544,7 @@ function getOption(data = [], active) {
     legend: {
       textStyle: {
         // color: '#fff',
-        fontSize: 18,
+        fontSize: 24,
       },
     },
     grid: {
@@ -555,36 +556,22 @@ function getOption(data = [], active) {
     xAxis: {
       type: 'category',
       data: xAxis,
-      axisLine: {
-        lineStyle: {
-          // color: '#fff',
-        },
-      },
-      splitLine: {
-        lineStyle: {
-          // color: '#fff',
-        },
+      nameTextStyle: {
+        fontSize: 24,
       },
       axisLabel: {
-        // color: '#fff',
+        fontSize: 24,
       },
     },
     yAxis: {
       name: yAxisName,
       type: 'value',
       boundaryGap: [0, 0.01],
-      axisLine: {
-        lineStyle: {
-          // color: '#fff',
-        },
-      },
-      splitLine: {
-        lineStyle: {
-          // color: '#fff',
-        },
+      nameTextStyle: {
+        fontSize: 24,
       },
       axisLabel: {
-        // color: '#fff',
+        fontSize: 24,
       },
     },
     series,
@@ -705,6 +692,21 @@ function getMembraneOption(data = []) {
 
 const Optimization = ({ data }) => {
   if (!data?.optimization) return '';
+
+  const NAME_MAP = {
+    peb_interval: '反冲洗周期调整',
+    pac_fr: '絮凝剂投加建议',
+    ceb_residue_count: '超滤微滤, 剩余药洗次数',
+    ceb_permeability: '超滤微滤, 渗透率低于阈值, 药洗提醒',
+    ceb_time_expire: '超滤微滤药洗提醒',
+    ro_pressure_1st: 'ro一段运行状况',
+    ro_pressure_2nd: 'ro二段运行状况',
+    ro_pressure_3th: 'ro三段运行状况',
+    ro_nob_interval: 'ro非氧化杀菌调整',
+    ro_wash_interval: 'ro冲洗调整',
+    ro_residue_count: 'ro化学清洗后,剩余的可清洗次数',
+  };
+
   return (
     <div className={styles.optimization}>
       <div className={styles.title1}>
@@ -712,8 +714,8 @@ const Optimization = ({ data }) => {
       </div>
       <div className={styles.title2}>调整内容</div>
       {Object.entries(data.optimization).map(([key, item]) => (
-        <div className={styles.content}>
-          {key}:{item.remark}
+        <div key={key} className={styles.content}>
+          【{NAME_MAP[key]}】{item.remark}
         </div>
       ))}
     </div>

src/pages/Smart/components/SimulateDetail.less

@@ -1,6 +1,5 @@
 .box {
   display: flex;
-  min-height: 54.2vh;
 }
 
 .title {
@@ -96,14 +95,14 @@
 .chartBox {
   width: 100%;
   height: 100%;
-  padding: 20px;
+  padding: 28px 32px;
   :global {
     .ant-select-selection-item {
-      line-height: 42px !important;
-      font-size: 22px !important;
+      line-height: 60px !important;
+      font-size: 30px !important;
     }
     .ant-select-selector {
-      height: 44px !important;
+      height: 60px !important;
     }
   }
 }
@@ -112,21 +111,20 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px;
+  margin-bottom: 30px;
 }
 
 .dateTabs {
   display: flex;
   border: 1px solid #d5d5d5;
-  border-radius: 5px;
-  height: 44px;
+  height: 60px;
   .dateTabsItem {
-    width: 94px;
+    width: 128px;
     text-align: center;
     cursor: pointer;
     border-right: 1px solid #d5d5d5;
-    line-height: 44px;
-    font-size: 18px;
+    line-height: 60px;
+    font-size: 24px;
     font-weight: 400;
     color: #4a4a4a;
     &:last-child {
@@ -140,29 +138,30 @@
 }
 .optimization {
   background-color: rgba(245, 166, 35, 0.08);
-  padding: 16px 24px;
-  margin-top: 20px;
+  padding: 20px 30px;
+  margin-top: 24px;
   .title1 {
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 28px;
-    margin-bottom: 15px;
+    line-height: 38px;
+    margin-bottom: 20px;
   }
   .title2 {
-    padding: 4px 15px;
+    padding: 6px 20px;
     background: rgba(245, 166, 35, 0.35);
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 28px;
-    margin-bottom: 10px;
+    line-height: 38px;
+    margin-bottom: 12px;
   }
   .content {
-    font-size: 20px;
+    font-size: 28px;
     font-weight: 400;
     color: #4a4a4a;
-    line-height: 34px;
-    padding-left: 15px;
+    line-height: 38px;
+    padding-left: 20px;
+    margin-bottom: 10px;
   }
 }

src/pages/Smart/components/SimulatePie.js

@@ -19,6 +19,7 @@ const SimulatePie = (props) => {
     ],
     onSuccess(data) {
       console.log(data);
+      if (Object.keys(data).length == 0) return;
       let options = getOption(data);
 
       // chartRef.current.clear();
@@ -45,8 +46,8 @@ const SimulatePie = (props) => {
   }, []);
 
   return (
-    <div className="card-box" style={{ padding: 20, marginTop: 20 }}>
-      <h2 style={{ textAlign: 'center', fontSize: 22, color: '#4A4A4A' }}>
+    <div className="card-box" style={{ padding: 26, marginTop: 30 }}>
+      <h2 style={{ textAlign: 'center', fontSize: 30, color: '#4A4A4A' }}>
         通过模拟仿真预计未来一日可省 &nbsp;
         <span style={{ color: '#F5A623' }}>{getProfit()}元</span>
       </h2>

src/pages/Smart/index.js

@@ -20,16 +20,17 @@ const Work = (props) => {
     <PageContent>
       <PageTitle>水厂工况</PageTitle>
       <div className={styles.score}>
-        <CircleScore>
+        <CircleScore big>
           {data?.score}
-          <div style={{ fontSize: 18 }}>{data?.grade}</div>
+          <div style={{ fontSize: 24 }}>{data?.grade}</div>
         </CircleScore>
         <div className={styles.scoreRight}>
           <h3>当前运行{data?.grade}，可继续优化</h3>
           <div className={styles.time}>{data?.clac_time}</div>
           {data?.score && (
             <Button
-              style={{ marginRight: 20, height: 50 }}
+              style={{ marginRight: 20}}
+              className={styles.btn}
               type="primary"
               onClick={() =>
                 history.push(
@@ -42,7 +43,7 @@ const Work = (props) => {
           )}
 
           <Button
-            style={{ height: 50 }}
+            className={styles.btn}
             type="primary"
             onClick={() =>
               history.push('/smart/condition-detection/' + projectId)

src/pages/Smart/index.less

@@ -4,56 +4,61 @@
   display: flex;
   align-items: center;
   padding-left: 60px;
-  margin-bottom: 20px;
+  margin-bottom: 52px;
 }
 
 .scoreRight {
-  margin-left: 30px;
+  margin-left: 56px;
 
   h3 {
-    font-size: 22px;
+    font-size: 28px;
     font-family: PingFangSC-Regular, PingFang SC;
     color: #4a4a4a;
-    line-height: 30px;
-    margin-bottom: 6px;
+    line-height: 40px;
+    margin-bottom: 9px;
   }
 
   .time {
-    margin-bottom: 12px;
-    font-size: 18px;
+    margin-bottom: 16px;
+    font-size: 24px;
     font-weight: 400;
     color: #6e6e6e;
-    line-height: 24px;
+    line-height: 32px;
+  }
+  .btn {
+    height: 66px;
+    width: 134px;
+    font-size: 22px;
   }
 }
 
 .card {
   border-radius: 8px;
   box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 0.3);
-  padding: 20px;
-  padding-top: 10px;
+  padding: 16px;
   border: 1px solid #eee;
   margin: 10px 0;
   background: rgba(255, 255, 255, 0.6);
 
   h3 {
-    font-size: 20px;
+    font-size: 28px;
     color: #4a4a4a;
-    line-height: 28px;
-    margin-bottom: 14px;
+    line-height: 38px;
+    margin-bottom: 12px;
     font-weight: bold;
   }
 
   ul {
     margin: 0;
     padding: 0;
+    padding-bottom: 10px;
 
     li {
       margin-bottom: 16px;
-      font-size: 18px;
+      font-size: 24px;
       font-weight: 400;
       color: #4a4a4a;
-      line-height: 24px;
+      line-height: 30px;
       &:last-child {
         margin-bottom: 0;
       }
@@ -62,8 +67,8 @@
 
   i {
     display: inline-block;
-    width: 10px;
-    height: 10px;
+    width: 14px;
+    height: 14px;
     background-color: #4a90e2;
     border-radius: 50%;
     margin-right: 8px;

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -15,7 +15,7 @@ import {
 import { getMandateDetail } from '@/services/TaskManage';
 import { useLocation } from '@@/exports';
 import { connect, useRequest } from '@umijs/max';
-import { Button, Col, Divider, Row } from 'antd';
+import { Col, Divider, Row } from 'antd';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'umi';
 import styles from './taskDetail.less';
@@ -98,21 +98,21 @@ function TaskDetail(props: IPropsType) {
       <div className={`${styles.cardContainer} card-box`}>
         <div className={styles.normalInfo}>
           <Row className={styles.infoRow}>
-            <Col className={styles.fontS18} span={16}>
+            <Col className={styles.fontS24} span={16}>
               时间：{mandateDetail?.CreateTime}
             </Col>
             {/*// @ts-ignore*/}
-            <Col className={styles.fontS18} span={8}>
+            <Col className={styles.fontS24} span={8}>
               {/*//@ts-ignore*/}
               任务类别：{mandateDetail?.MandateClass?.label}
             </Col>
           </Row>
           <Row>
-            <Col className={styles.fontS18} span={16}>
+            <Col className={styles.fontS24} span={16}>
               {/*//@ts-ignore*/}
               任务状态：{mandateDetail?.Status?.label}
             </Col>
-            <Col className={styles.fontS18} span={8}>
+            <Col className={styles.fontS24} span={8}>
               {/*// @ts-ignore*/}
               任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
             </Col>
@@ -120,25 +120,25 @@ function TaskDetail(props: IPropsType) {
         </div>
         <div className={styles.detailInfo}>
           <Row className={styles.infoRow}>
-            <Col className={styles.fontS18} span={4}>
+            <Col className={styles.fontS24} span={4}>
               任务总结
             </Col>
-            <Col className={styles.fontS18}>{mandateDetail?.Summary}</Col>
+            <Col className={styles.fontS24}>{mandateDetail?.Summary}</Col>
           </Row>
           <Row>
-            <Col className={styles.fontS18} span={4}>
+            <Col className={styles.fontS24} span={4}>
               任务内容
             </Col>
-            <Col className={styles.fontS18} span={20}>
-              <Col>{mandateDetail?.Detail}</Col>
+            <Col className={styles.fontS24} span={20}>
+              {mandateDetail?.Detail}
               {/*<Table />*/}
             </Col>
           </Row>
         </div>
         <div className={styles.relatedOrder}>
           <div
-            className={styles.fontS22}
-            style={{ marginLeft: '15px', marginBottom: '15px' }}
+            className={styles.fontS28}
+            style={{ marginLeft: '5px', marginBottom: '25px' }}
           >
             关联工单
           </div>
@@ -147,41 +147,37 @@ function TaskDetail(props: IPropsType) {
               <div key={order.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row className={styles.infoRow}>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       工单编号：{order.Id}
                     </Col>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       时间：{order.CreateTime}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {/*// @ts-ignore*/}
                         {order.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       {/*// @ts-ignore*/}
                       工单负责人：{order.Responsible?.CName}
                     </Col>
                   </Row>
                 </div>
                 <Divider type="vertical" style={{ height: '40px' }} />
-                <div className={styles.rightButton}>
-                  <Button
-                    className={styles.fontS18}
-                    style={{ color: '#5697e4' }}
-                    type="text"
-                    size="large"
-                    onClick={() => {
-                      // @ts-ignore
-                      goTaskOrder(order.Id, order.RecordType?.value);
-                    }}
-                  >
-                    查看工单
-                  </Button>
+                <div
+                  className={styles.rightButton}
+                  style={{ color: '#5697e4' }}
+                  onClick={() => {
+                    // @ts-ignore
+                    goTaskOrder(order.Id, order.RecordType?.value);
+                  }}
+                >
+                  查看工单
                 </div>
               </div>
             );

src/pages/TaskManage/Detail/TaskDetail/taskDetail.less

@@ -4,26 +4,27 @@
   background-color: white;
 
   .normalInfo {
-    padding: 15px 15px;
+    padding: 25px 15px;
     background-color: #fdf2df;
   }
 
   .infoRow {
-    margin-bottom: 15px;
+    margin-bottom: 25px;
   }
 
 
   .detailInfo {
-    padding: 15px 15px;
+    padding: 25px 15px;
     border-bottom: 1px solid gray;
   }
 
   .relatedOrder {
+    padding: 0 15px;
     margin-top: 15px;
   }
 
   .workOrderCard {
-    margin-bottom: 20px;
+    margin-bottom: 25px;
     padding: 20px 10px;
     border-radius: 8px;
     background-color: #e5effa;
@@ -37,6 +38,7 @@
     .rightButton {
       flex: auto;
       color: #5697e4;
+      font-size: 24px;
       text-align: center;
       display: flex;
       justify-content: center;
@@ -45,6 +47,10 @@
   }
 }
 
+.fontS28 {
+  font-size: 28px;
+}
+
 .fontS24 {
   font-size: 24px;
 }

src/pages/TaskManage/Detail/TaskList/TaskList.tsx

@@ -17,16 +17,7 @@ import { connect, useLocation } from '@umijs/max';
 import TopFilter from '@/pages/TaskManage/components/TopFilter';
 import { IMandateType } from '@/pages/TaskManage/index.types';
 import { useNavigate } from '@@/exports';
-import {
-  Button,
-  Col,
-  Collapse,
-  CollapseProps,
-  Divider,
-  List,
-  Row,
-  Spin,
-} from 'antd';
+import { Col, Collapse, CollapseProps, Divider, List, Row, Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
 import styles from './taskList.less';
 
@@ -178,38 +169,34 @@ const TaskList: React.FC<IPropsType> = (props) => {
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
                 <Row style={{ marginBottom: '15px' }}>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单编号：{order.Id}
                   </Col>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
               </div>
               <Divider type="vertical" style={{ height: '40px' }} />
-              <div className={styles.rightButton}>
-                <Button
-                  size='large'
-                  className={styles.fontS18}
-                  style={{ color: '#5697e4' }}
-                  type="text"
-                  onClick={() => {
-                    goTaskOrder(order.Id, order.RecordType?.value);
-                  }}
-                >
-                  查看工单
-                </Button>
+              <div
+                className={styles.rightButton}
+                style={{ color: '#5697e4' }}
+                onClick={() => {
+                  goTaskOrder(order.Id, order.RecordType?.value);
+                }}
+              >
+                查看工单
               </div>
             </div>
           );
@@ -221,11 +208,11 @@ const TaskList: React.FC<IPropsType> = (props) => {
       <List.Item>
         <div className={`${styles.cardContainer} card-box`}>
           <Row justify="space-between" style={{ marginBottom: '20px' }}>
-            <Col className={styles.fontS18}>时间：{formatItem.CreateTime}</Col>
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>时间：{formatItem.CreateTime}</Col>
+            <Col className={styles.fontS24}>
               任务类别：{formatItem.MandateClass?.label}
             </Col>
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>
               任务负责人：{formatItem.ResponsiblePeople?.CName || '-'}
             </Col>
           </Row>
@@ -233,26 +220,26 @@ const TaskList: React.FC<IPropsType> = (props) => {
             justify="space-between"
             style={{ paddingBottom: '10px', borderBottom: '1px solid gray' }}
           >
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>
               任务状态：{formatItem.Status?.label || '-'}
             </Col>
             <Col>
               <div
+                className={styles.fontS24}
                 style={{
                   backgroundColor: '#f5a623',
+                  color: 'white',
+                  width: '150px',
+                  height: '50px',
+                  display: 'flex',
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                }}
+                onClick={() => {
+                  goTaskDetail(item);
                 }}
               >
-                <Button
-                  className={styles.fontS18}
-                  style={{ color: 'white' }}
-                  type="text"
-                  size="large"
-                  onClick={() => {
-                    goTaskDetail(item);
-                  }}
-                >
-                  任务详情
-                </Button>
+                任务详情
               </div>
             </Col>
           </Row>

src/pages/TaskManage/Detail/TaskList/taskList.less

@@ -6,7 +6,7 @@
   .collapseLabel {
     width: 100%;
     .ant-collapse-arrow{
-      font-size: 18px;
+      font-size: 24px;
     }
     :global {
       .ant-collapse-item{
@@ -19,12 +19,12 @@
         margin-top: 10px;
 
         .ant-collapse-header-text {
-          font-size: 18px;
+          font-size: 24px;
           flex: unset;
           margin-inline-end: unset;
         }
         .ant-collapse-arrow{
-          font-size: 18px;
+          font-size: 24px;
         }
       }
     }
@@ -44,6 +44,7 @@
       .rightButton {
         flex: auto;
         color: #5697e4;
+        font-size: 24px;
         text-align: center;
         display: flex;
         justify-content: center;
@@ -53,6 +54,18 @@
   }
 }
 
+.fontS28{
+  font-size: 28px;
+}
+
+.fontS26{
+  font-size: 26px;
+}
+
+.fontS24{
+  font-size: 24px;
+}
+
 .fontS20{
   font-size: 20px;
 }

src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -132,41 +132,41 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
           />
           <div style={{ padding: '15px' }}>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18} span={16}>
+              <Col className={styles.fontS24} span={16}>
                 时间：{'-'}
               </Col>
-              <Col className={styles.fontS18} span={8}>
+              <Col className={styles.fontS24} span={8}>
                 {/*// @ts-ignore*/}
                 工单负责人：{orderInfo?.Repairman?.CName || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18} span={16}>
+              <Col className={styles.fontS24} span={16}>
                 {/*// @ts-ignore*/}
                 工单状态：{orderInfo?.OrderStatus?.label}
               </Col>
-              <Col className={styles.fontS18} span={8}>
+              <Col className={styles.fontS24} span={8}>
                 派单人员：{'-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 派单时间：{orderInfo?.CreateTime || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 计划完成时间：{orderInfo?.PlanTime || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 实际完成时间：{orderInfo?.RepairTime || '-'}
               </Col>
             </Row>
             <Row>
-              <Col className={styles.fontS18}>工单详情：</Col>
-              <Col className={styles.fontS18} span={20}>
+              <Col className={styles.fontS24}>工单详情：</Col>
+              <Col className={styles.fontS24} span={20}>
                 {orderInfo?.Reason}
                 {/*<Table />*/}
               </Col>
@@ -177,10 +177,10 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
         {/*  <SubTitle title="维修内容" />*/}
         {/*  <div style={{ padding: '15px' }}>*/}
         {/*    <Row className={styles.rowMargin}>*/}
-        {/*      <Col className={styles.fontS18}>是否润滑加油：否</Col>*/}
+        {/*      <Col className={styles.fontS24}>是否润滑加油：否</Col>*/}
         {/*    </Row>*/}
         {/*    <Row>*/}
-        {/*      <Col className={styles.fontS18} >是否清洁：否</Col>*/}
+        {/*      <Col className={styles.fontS24} >是否清洁：否</Col>*/}
         {/*    </Row>*/}
         {/*  </div>*/}
         {/*</div>*/}

src/pages/TaskManage/Detail/TaskOrder/taskOrder.less

@@ -14,6 +14,10 @@
   margin-bottom: 15px;
 }
 
+.fontS28 {
+  font-size: 28px;
+}
+
 .fontS24 {
   font-size: 24px;
 }

src/pages/TaskManage/components/SubTitle.tsx

@@ -25,7 +25,7 @@ const SubTitle: React.FC<IPropsType> = ({
         paddingLeft: '20px',
         paddingRight: '10px',
         backgroundColor: '#d9e7f9',
-        fontSize: '20px',
+        fontSize: '26px',
         height: '66px',
         borderRadius: radius ? '8px 8px 0 0 ' : 'unset',
       }}
@@ -40,9 +40,9 @@ const SubTitle: React.FC<IPropsType> = ({
             src={img}
             alt="status"
             style={{
-              position: 'absolute',
-              right: '10px',
-              top: '34px',
+              position: 'relative',
+              left: '10px',
+              bottom:"10px"
             }}
           />
         </div>

src/pages/TaskManage/index.less

@@ -15,7 +15,7 @@
 
       .countNumber {
         color: #f5a623;
-        font-size: 24px;
+        font-size: 28px;
         margin-bottom: 6px;
       }
     }
@@ -37,6 +37,18 @@
   width: unset;
 }
 
+.fontS28{
+  font-size: 28px;
+}
+
+.fontS26{
+  font-size: 26px;
+}
+
+.fontS24{
+  font-size: 24px;
+}
+
 .fontS20{
   font-size: 20px;
 }

src/pages/TaskManage/index.tsx

@@ -49,10 +49,10 @@ const TaskManage: React.FC<IPropTypes> = (props) => {
           goTaskList(item.value);
         }}
       >
-        <List.Item.Meta title={<span className={styles.fontS20}>{item.label}</span>} />
+        <List.Item.Meta title={<span className={styles.fontS28}>{item.label}</span>} />
         <div className={styles.itemCount}>
           <div className={styles.countNumber}>{mandateCount[index]}</div>
-          <div className={styles.fontS16}>任务数量</div>
+          <div className={styles.fontS20}>任务数量</div>
         </div>
         <RightOutlined />
       </List.Item>

src/services/controller.js

@@ -11,7 +11,7 @@ export async function queryLightList(project_id) {
   });
 }
 export async function queryDevice(project_id) {
-  return request(`/api/iot/v1/lamp/list`, {
+  return request(`/api/iot/v1/lbs/mobile_device/list`, {
     params: { project_id },
   });
 }