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

.umirc.ts

@@ -28,6 +28,7 @@ export default defineConfig({
     '/api': {
       // target: 'http://47.96.12.136:8888/',
       target: 'http://47.96.12.136:8788/',
+      // target: 'http://120.55.44.4:8903/',
       // target: 'https://work.greentech.com.cn/',
       changeOrigin: true,
     },

src/pages/Smart/OptimizationTasks.js

@@ -113,7 +113,7 @@ const Produce = ({ projectId, queryMandate }) => {
           >
             <h3 className={styles.left}>任务总结</h3>
             <div className={styles.desc}>
-              根据水质相关数艍．建议您调节以下参数，水厂运行可达较优状态
+              根据水质相关数据．建议您调节以下参数，水厂运行可达较优状态
             </div>
           </div>
           <div

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

@@ -258,7 +258,6 @@ function TaskDetail(props: IPropsType) {
     orderType: number,
     mandateClass: number,
   ) => {
-    console.log(mandateDetail);
     navigate(
       `/task-manage/list/order-detail?project_id=${project_id}&order_id=${orderID}&order_type=${orderType}&mandate_class=${mandateClass}`,
     );
@@ -295,7 +294,10 @@ function TaskDetail(props: IPropsType) {
             <Col className={styles.fontS24} span={4}>
               任务总结
             </Col>
-            <Col className={styles.fontS24}>{mandateDetail?.Summary}</Col>
+            <Col className={styles.fontS24}>
+              {mandateDetail?.Summary ||
+                '根据水质相关数据．建议您调节以下参数，水厂运行可达较优状态'}
+            </Col>
           </Row>
           {mandateDetail?.img && (
             <Row className={styles.infoRow}>

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

@@ -7,6 +7,7 @@ import {
   getCraftRecordList,
   getMaintainRecordList,
   getRepairRecordList,
+  queryReagentDetail,
 } from '@/services/TaskManage';
 import { useLocation } from '@@/exports';
 import { connect, useRequest } from '@umijs/max';
@@ -52,6 +53,7 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
   const mandate_class = Number(queryParams.get('mandate_class'));
 
   const [orderInfo, setOrderInfo] = useState<IOrderInfo>();
+  const [additionalInfo, setAdditionalInfo] = useState<any>({});
 
   // 根据type请求详情
   const { run: getMaintainDetail } = useRequest(getMaintainRecordList, {
@@ -197,6 +199,15 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
               })
             : [],
       };
+      if (order_type === 5) {
+        queryReagentDetail({ id: temp.id })
+          .then((res) => {
+            if (res) {
+              setAdditionalInfo(res);
+            }
+          })
+          .catch((err) => console.log(err));
+      }
       setOrderInfo(tempDetail);
     },
   });
@@ -211,6 +222,7 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
     switch (order_type) {
       // 工艺
       case 1:
+      case 5:
       case 6:
         getCraftDetail({ project_id, work_id: order_id });
         break;
@@ -307,6 +319,14 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
                 {orderInfo?.Reason}
               </Col>
             </Row>
+            {order_type === 5 && (
+              <Row className={styles.rowMarginTop}>
+                <Col className={styles.fontS28}>加药详情：</Col>
+                <Col className={styles.fontS28} span={18}>
+                  {`药剂名称：${additionalInfo?.name} 加药量：${additionalInfo?.dosage}升 浓度：${additionalInfo?.concentration}`}
+                </Col>
+              </Row>
+            )}
             {orderInfo?.MandateImages?.length > 0 && (
               <Row className={styles.rowMarginTop}>
                 <Col className={styles.fontS28}>任务图片：</Col>

src/services/TaskManage.js

@@ -121,3 +121,9 @@ export async function getDiagnosticDetail(detailId) {
   const res = await request(`/api/v1/dumu/detail/${detailId}`);
   return res.data;
 }
+
+//加药详情接口
+export async function queryReagentDetail(data) {
+  const res = await request(`/api/v1/reagent/detail?${stringify(data)}`);
+  return res.data;
+}

src/services/eqSelfInspection.js

@@ -12,7 +12,7 @@ export async function getAutoPatrolByRouteId(params) {
 }
 export async function getDumuDetail(detailId) {
   const res = await request(`/api/v1/dumu/detail/${detailId}`);
-  return res.data;
+  return res;
 }
 
 export async function queryUserList(param) {