瀏覽代碼

feat: 修复问题,优化派单

ZhaoJun 1 年之前
父節點
當前提交
6b536a224b

+ 6 - 3
src/pages/Home/EnergyCostDetail.js

@@ -73,7 +73,7 @@ export const EnergyDetail = () => {
             {
               type: 0,
               name: '吨水电耗',
-              data: tempData?.map((item) => item.value) || [],
+              data: tempData?.map((item) => item.value.toFixed(2)) || [],
             },
           ],
         };
@@ -87,8 +87,11 @@ export const EnergyDetail = () => {
       queryChartList({
         project_id: Number(projectId),
         metric_code: 'plant_electricity',
-        start_time: dayjs().subtract(2,"day").startOf('day').format('YYYY-MM-DD 00:00:00'),
-        end_time: dayjs().subtract(1,"day").format('YYYY-MM-DD 23:59:59'),
+        start_time: dayjs()
+          .subtract(2, 'day')
+          .startOf('day')
+          .format('YYYY-MM-DD 00:00:00'),
+        end_time: dayjs().subtract(1, 'day').format('YYYY-MM-DD 23:59:59'),
       }),
     {
       pollingInterval: TIMER,

+ 22 - 10
src/pages/Home/QualityMng.js

@@ -3,6 +3,7 @@ import ChartModule from '@/components/ManagementPage/chartModule';
 // import SearchModule from '@/components/ManagementPage/searchModule';
 import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
+import TabsContent from '@/components/TabsContent';
 import {
   queryChartListByCode,
   queryProcessSection,
@@ -11,7 +12,7 @@ import {
 import { queryConditionSnapshot } from '@/services/SmartOps';
 import { UnityAction } from '@/utils/utils';
 import { useParams, useRequest } from '@umijs/max';
-import { Empty, Select, Spin, Table } from 'antd';
+import { Empty, Spin, Table } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import SubTitle from '../SmartOps/components/SubTitle';
@@ -48,6 +49,12 @@ export const WaterQuality = ({ showTip = false }) => {
         setCode(res[0]);
       }
     },
+    formatResult: (result) => {
+      if (result?.data) {
+        return result.data.reverse();
+      }
+      return [];
+    },
   });
 
   // 获取工艺段列表
@@ -158,15 +165,20 @@ export const WaterQuality = ({ showTip = false }) => {
       </div>
       <div className="card-box" style={{ padding: '0.2rem' }}>
         <div style={{ padding: '0.2rem 0' }}>
-          <Select
-            style={{ width: '2rem' }}
-            defaultValue="全厂概览"
-            options={processList?.map((item) => {
-              return {
-                value: item.id,
-                label: item.name,
-              };
-            })}
+          <TabsContent
+            defaultActiveKey="19"
+            center={false}
+            small
+            spacing={2.5}
+            items={processList
+              ?.map((item) => {
+                return {
+                  key: item.id,
+                  label: item.name,
+                  children: null,
+                };
+              })
+              .filter((item) => item.label !== '膜车间全景')}
             onChange={handleProcessChange}
           />
         </div>

+ 2 - 2
src/pages/SmartOps/operationManage/index.js

@@ -40,8 +40,8 @@ const OperationManage = () => {
           <Button
             style={{
               position: 'absolute',
-              top: '0.2rem',
-              right: '0.2rem',
+              top: '0.3rem',
+              right: '0.3rem',
               fontSize: '0.26rem',
               height: '0.5rem',
               zIndex: 1,

+ 14 - 0
src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -341,6 +341,7 @@ function TaskDetail(props: IPropsType) {
   const [withdrawOrderOpen, setWithdrawOrderOpen] = useState(false);
   const [clickedOrder, setClickedOrder] = useState<any>({});
 
+  const [flodWorkOrder, setFlodWorkOrder] = useState(true);
   const [ignoreModalOpen, setIgnoreModalOpen] = useState(false);
   const [autoHandleModalOpen, setAutoHandleModalOpen] = useState(false);
   const [mandateSelectModalOpen, setMandateSelectModalOpen] = useState(false);
@@ -605,7 +606,9 @@ function TaskDetail(props: IPropsType) {
     }
     const result = await onDispatchTaskConfirm(params);
     if (result) {
+      setMandateSelectModalOpen(false);
       setDispatchModalOpen(false);
+      setFlodWorkOrder(false);
       refreshDetail();
     }
   };
@@ -827,6 +830,7 @@ function TaskDetail(props: IPropsType) {
                   onClick={() => {
                     openSpecifiedModal('ignore');
                   }}
+                  disabled={mandateDetail?.Status?.value !== 0}
                 >
                   忽略
                 </Button>
@@ -838,6 +842,7 @@ function TaskDetail(props: IPropsType) {
                   onClick={() => {
                     openSpecifiedModal('manual');
                   }}
+                  disabled={mandateDetail?.Status?.value !== 0}
                 >
                   手动处理
                 </Button>
@@ -849,6 +854,7 @@ function TaskDetail(props: IPropsType) {
                   onClick={() => {
                     openSpecifiedModal('auto');
                   }}
+                  disabled={mandateDetail?.Status?.value !== 0}
                 >
                   自动处理
                 </Button>
@@ -860,6 +866,10 @@ function TaskDetail(props: IPropsType) {
                   onClick={() => {
                     openSpecifiedModal('dispatch');
                   }}
+                  disabled={
+                    mandateChild?.filter((item) => item.Status === 0)
+                      ?.length === 0
+                  }
                 >
                   派单
                 </Button>
@@ -869,6 +879,7 @@ function TaskDetail(props: IPropsType) {
           <div className={styles.relatedOrder}>
             <Collapse
               className={styles.collapseLabel}
+              activeKey={flodWorkOrder ? '' : '1'}
               ghost
               expandIcon={({ isActive }) => (
                 <CaretDownFilled
@@ -877,6 +888,9 @@ function TaskDetail(props: IPropsType) {
                 />
               )}
               items={handledWorkOrder}
+              onChange={() => {
+                setFlodWorkOrder(!flodWorkOrder);
+              }}
             />
           </div>
         </div>