Merge branch 'develop'

src/pages/Center/MyTask/Detail/workOrderDetail.less

@@ -34,7 +34,7 @@
       > .ant-steps-item
       .ant-steps-item-description {
       padding-bottom: 0;
-      padding-top: 0.18rem;
+      // padding-top: 0.18rem;
     }
   }
 }

src/pages/EqSelfInspection/components/Detail.js

@@ -272,6 +272,7 @@ export function DeviceTable(props) {
     userList,
     type,
   } = props;
+  console.log(items);
   const { ProjectId, Id } = data;
   const [loading, setLoading] = useState(false);
   const [visible, setVisible] = useState(false);
@@ -311,7 +312,9 @@ export function DeviceTable(props) {
     },
     {
       title: '巡检项',
-      dataIndex: 'TemplateItem.Name',
+      key: 'TemplateItem.Name',
+      dataIndex: 'TemplateItem',
+      render: (TemplateItem) => <div>{TemplateItem.Name}</div>,
     },
     // {
     //   title: '设备位号',

src/pages/Home/index.less

@@ -190,8 +190,8 @@
     margin-top: 10px;
   }
   .circle {
-    width: 178px;
-    height: 178px;
+    width: 210px;
+    height: 210px;
     text-align: center;
     display: flex;
     flex-direction: column;

src/pages/SmartOps/ChartPage.js

@@ -136,11 +136,6 @@ const ChartPage = (props) => {
     const options = {
       yName: '',
       xData: data.length > 0 && data[0]?.map((item) => item.htime_at),
-      legend: {
-        textStyle: {
-          color: '#ffffff',
-        },
-      },
       dataList: data?.map((item) => {
         return {
           type: 0,

src/pages/SmartReport/index.js

@@ -189,7 +189,7 @@ const SmartReport = () => {
     return (
       <div className={styles.longWhiteBox}>
         <div className={styles.longWhiteBoxIn}>
-          {label}
+          <div>{label}</div>
           <span className={styles.value}>
             {value}
             {unit && <span className={styles.unit}>{unit}</span>}
@@ -314,8 +314,8 @@ const SmartReport = () => {
           <div className={styles.scrollContent}>
             <Box title="概览">
               <div className={styles.content}>
-                <TwoBoxItem label="累计进水：" value={in_water} />
-                <TwoBoxItem label="累计出水：" value={out_water} />
+                <TwoBoxItem label="累计进水" value={in_water} />
+                <TwoBoxItem label="累计出水" value={out_water} />
 
                 <ThreeBoxContent
                   data={[
@@ -334,12 +334,12 @@ const SmartReport = () => {
                 />
 
                 <TwoBoxItem
-                  label="优化建议："
+                  label="优化建议"
                   value={push_optimize_task}
                   unit="条"
                 />
                 <TwoBoxItem
-                  label="任务完成："
+                  label="任务完成"
                   value={push_complete_task}
                   unit="个"
                 />
@@ -417,7 +417,7 @@ const SmartReport = () => {
             <div className={styles.box}>
               <div className={styles.main_in}>
                 <div className={styles.titleContent}>智慧运营</div>
-                <CircleThreeContent
+                <ThreeContent
                   data={[
                     {
                       label: '优化条数',

src/pages/SmartReport/index.less

@@ -137,7 +137,6 @@
     width: 48%;
     white-space: nowrap;
     padding: 0.02rem;
-    height: 1.05rem;
     box-shadow: 0 0.05rem 0.14rem 0 rgba(141, 141, 141, 0.2);
     border-radius: 0.95rem;
     background-image: linear-gradient(
@@ -147,13 +146,14 @@
     );
   }
   .longWhiteBoxIn {
-    padding: 0 0.4rem;
+    text-align: center;
+    padding: 0.2rem 0.4rem 0;
     background: #ffffff;
     border-radius: 1rem;
     font-size: 0.3rem;
     font-family: Helvetica;
     color: #1755ff;
-    line-height: 0.92rem;
+    // line-height: 0.92rem;
   }
   .blueText {
     font-size: 0.3rem;
@@ -205,8 +205,8 @@
     padding: 0.3rem;
     width: 2.54rem;
     height: 2.54rem;
-    background: url('@/assets/center/circle.png') no-repeat center;
-    background-size: 100% 100%;
+    // background: url('@/assets/center/circle.png') no-repeat center;
+    // background-size: 100% 100%;
     .blueText;
   }
   .circleValue {

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

@@ -237,9 +237,9 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
               ? dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')
               : '-',
           Reason: temp.detail,
-          Repairman: '-',
-          DispatchMan:
+          Repairman:
             userList.find((user) => user.ID === temp.operator_id) || '-',
+          DispatchMan: '-',
           OrderStatus:
             OrderStatus.find((status) => status.value === temp.status) || '-',
         };

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

@@ -27,7 +27,7 @@
       > .ant-steps-item
       .ant-steps-item-description {
       padding-bottom: 0;
-      padding-top: 0.18rem;
+      // padding-top: 0.18rem;
     }
   }
 }

src/pages/TaskManage/Detail/WorkOrderList/WorkOrderList.js

@@ -178,8 +178,6 @@ const WorkOrderList = (props) => {
                   temp = item.Repairman;
                 } else if (order_type === 3) {
                   temp = item.MaintenancePerson;
-                } else if (order_type === 4) {
-                  temp = '-';
                 } else if (order_type === 5) {
                   temp = '-';
                 } else {

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -1,6 +1,7 @@
 import {
   getCraftRecordList,
   getMaintainRecordList,
+  getPatrolMandateRecord,
   getReagentOrderDetail,
   getRepairRecordList,
   getWorkOrderFlow,
@@ -69,6 +70,7 @@ const WorkOrderModal = (props) => {
                   })
                 : [],
           };
+
           setOrderInfo(tempDetail);
           // 根据不同的工单类型查询工单操作详情
         }
@@ -193,6 +195,35 @@ const WorkOrderModal = (props) => {
     },
   );
 
+  const { run: getPatrolOrderList } = useRequest(getPatrolMandateRecord, {
+    manual: true,
+    formatResult: (result) => {
+      if (result?.data?.list) {
+        const temp = result.data.list[0];
+        console.log(userList);
+        const tempDetail = {
+          ...temp,
+          CreateTime: temp?.CreatedTime
+            ? dayjs(temp.CreatedTime).format('YYYY-MM-DD HH:mm')
+            : '-',
+          PlanTime: temp.plan_end_time
+            ? dayjs(temp.plan_end_time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          RepairTime: temp?.actual_end_time
+            ? dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          Reason: temp.detail,
+          Repairman:
+            userList.find((user) => user.ID === temp.operator_id) || '-',
+          DispatchMan: '-',
+          OrderStatus:
+            OrderStatus.find((status) => status.value === temp.status) || '-',
+        };
+        setOrderInfo(tempDetail);
+      }
+    },
+  });
+
   useRequest(getWorkOrderFlow, {
     defaultParams: [{ work_type: order_type, work_id: order_id }],
     formatResult(res) {
@@ -246,10 +277,16 @@ const WorkOrderModal = (props) => {
   };
 
   useEffect(() => {
+    if (userList.length === 0) {
+      dispatch({
+        type: 'taskUser/fetchUserList',
+        payload: { project_id: projectID },
+      });
+    }
     switch (order_type) {
       case 1:
-      case 4:
       case 6:
+      case 7:
         getCraftDetail({ project_id: projectID, work_id: order_id });
         break;
       case 2:
@@ -258,6 +295,9 @@ const WorkOrderModal = (props) => {
       case 3:
         getMaintainDetail({ project_id: projectID, id: order_id });
         break;
+      case 4:
+        getPatrolOrderList({ project_id: projectID, id: order_id });
+        break;
       case 5:
         getDosingOrder(order_id);
         break;