.

config/routes.js

@@ -160,6 +160,12 @@ export default [
         access: 'orderwarning',
         component: './OrderManage/JobWarning',
       },
+      {
+        path: '/OrderManage/JobWarning/detail.jsx',
+        name: '订单详情',
+        access: 'orderwarning',
+        component: './OrderManage/JobWarning/detail.jsx',
+      },
     ],
   },
   {

src/components/AMap/SearchPOI.jsx

@@ -64,7 +64,9 @@ export default (props) => {
 
       instance.on('click', handleClick);
       map.current = instance
-    })
+    }).catch((err) => {
+      console.log(err.message)
+    });
   }, [])
 
   useEffect(() => {
@@ -124,7 +126,7 @@ export default (props) => {
 
   return (
     <div className={className} style={boxStyle}>
-      <div ref={container} style={mapStyle} id="poi-map-wrapper"></div>
+      <div ref={container} style={mapStyle} id="poi-map-wrapper" />
       <input placeholder="请输入搜索关键字" ref={inputRef} style={inputSty1} />
       <input value={`坐标: ${currentPos.join(',')}`} style={inputSty2} disabled />
     </div>

src/components/AMap/weather.js

@@ -11,5 +11,8 @@ export default function getWeather(city) {
       } else {
         return Promise.reject(res.info);
       }
+    })
+    .catch((err) => {
+      console.log(err.message);
     });
 }

src/components/CooperativeSearch/index.jsx

@@ -11,6 +11,8 @@ export default (props) => {
   const searchData = (val) => {
     getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
       setList(res.records || []);
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
 
@@ -24,6 +26,8 @@ export default (props) => {
     if (value) {
       getCooperativeDetail(value).then((res) => {
         setList([res]);
+      }).catch((err) => {
+        console.log(err.message)
       });
     }
   }, [value]);

src/components/ExtendContent/List.jsx

@@ -20,7 +20,10 @@ export default forwardRef((props, ref) => {
         setList(res.records || []);
         setLoading(false);
       })
-      .catch(() => setLoading(false));
+      .catch((err) => {
+        console.log(err.message)
+        setLoading(false)
+      });
   };
 
   refs.current = tableList;
@@ -43,7 +46,10 @@ export default forwardRef((props, ref) => {
         setLoading(false);
         // refs.current.reload();
       })
-      .catch(() => setLoading(false));
+      .catch((err) => {
+        console.log(err.message)
+        setLoading(false)
+      });
   };
 
   const columns = [

src/components/ExtendContent/index.jsx

@@ -29,6 +29,8 @@ export default (props) => {
         next();
 
         message.success('更新数据成功');
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else if (data.content) {
       // 新增提交
@@ -38,6 +40,8 @@ export default (props) => {
         next();
 
         message.success('保存数据成功');
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else {
       next();

src/components/GeoMap/map.js

@@ -8,25 +8,29 @@ export default (containerRef) => {
   const [map, setMap] = useState();
 
   useEffect(() => {
-    loader(plugins).then((AMap) => {
-      amapRef.current = AMap;
-      const mapInst = new AMap.Map(containerRef.current, {
-        mapStyle: 'amap://styles/669a7d8709a9bab0945747a1a1db3327',
-        // mapStyle: 'amap://styles/blue',
-        zoom: 10,
-        resizeEnable: true,
-        center: [112.092716, 32.681642],
-      });
+    loader(plugins)
+      .then((AMap) => {
+        amapRef.current = AMap;
+        const mapInst = new AMap.Map(containerRef.current, {
+          mapStyle: 'amap://styles/669a7d8709a9bab0945747a1a1db3327',
+          // mapStyle: 'amap://styles/blue',
+          zoom: 10,
+          resizeEnable: true,
+          center: [112.092716, 32.681642],
+        });
 
-      // 缩放按钮
-      mapInst.addControl(new AMap.ToolBar());
+        // 缩放按钮
+        mapInst.addControl(new AMap.ToolBar());
 
-      // 遮罩层;
-      geoPolygon(AMap, mapInst);
+        // 遮罩层;
+        geoPolygon(AMap, mapInst);
 
-      //
-      setMap(mapInst);
-    });
+        //
+        setMap(mapInst);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
   }, []);
 
   return { amapRef, map };

src/components/MachinetySelect/index.jsx

@@ -11,7 +11,9 @@ export default (props) => {
   const searchData = (val) => {
     getMachineryList({ name: val, pageSize: 9999 }).then((res) => {
       setList(res.records || [])
-    })
+    }).catch((err) => {
+      console.log(err.message)
+    });
   }
 
   const handleSearch = (text) => {
@@ -24,7 +26,9 @@ export default (props) => {
     if (value) {
       getMachineryDetail(value).then((res) => {
         setList([res])
-      })
+      }).catch((err) => {
+        console.log(err.message)
+      });
     }
   }, [value])
 

src/components/RightContent/ChangePassword.jsx

@@ -28,9 +28,11 @@ export default (props) => {
       if (onSuccess) {
         onSuccess()
       }
-    }).catch((err) => {
-      setLoading(false)
     })
+      .catch((err) => {
+        console.log(err.message)
+        setLoading(false)
+      });
   }
 
   const handleCancel = () => {

src/pages/ContentManagementSystem/Advertisement/index.jsx

@@ -24,6 +24,8 @@ export default (props) => {
     deleteBanner(e).then((res) => {
       message.success('删除成功');
       actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
   const handleOK = (record, data) => {
@@ -41,7 +43,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            message.error(err);
+            console.log(err.message)
           });
       },
     });

src/pages/ContentManagementSystem/InformationClassification/index.jsx

@@ -27,6 +27,8 @@ export default (props) => {
         message.success(`修改成功`);
         onCancel();
         actionRef.current.reload();
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else {
       addNewsType(values)
@@ -59,7 +61,7 @@ export default (props) => {
         actionRef.current.reload();
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   };
   useEffect(() => {

src/pages/ContentManagementSystem/InformationList/edit.jsx

@@ -54,12 +54,16 @@ export default (props) => {
   useEffect(() => {
     getNewsTypeList().then((res) => {
       setNewsTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   useEffect(() => {
     if (id) {
       getNewsDetail(id).then((res) => {
         form.setFieldsValue(res);
+      }).catch((err) => {
+        console.log(err.message)
       });
     }
   }, [id]);

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -25,6 +25,8 @@ export default (props) => {
     deleteNews(id).then(() => {
       message.success('删除成功');
       actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
   //列表切换资讯状态方法
@@ -43,7 +45,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            message.error(err);
+            console.log(err.message)
           });
       },
     });
@@ -51,6 +53,8 @@ export default (props) => {
   useEffect(() => {
     getNewsTypeList().then((res) => {
       setNewsTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   const actions = () => [

src/pages/JobStatistics/Order/index.jsx

@@ -26,17 +26,29 @@ export default (props) => {
     getevaluation(val).then(res => {
       setEval(res)
       setShow(true)
-    })
+    }).catch((err) => {
+      console.log(err.message)
+    });
   }
   useEffect(() => {
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   const columns = [
+    {
+      title: '订单号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      search: false
+    },
     {
       title: '合作社',
       dataIndex: 'orgId',

src/pages/Machinery/GPS/index.jsx

@@ -28,6 +28,8 @@ export default (props) => {
     deleteNote(e.noteId).then((res) => {
       message.success('删除成功');
       actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
 

src/pages/Machinery/Machinery/edit.jsx

@@ -81,16 +81,24 @@ export default (props) => {
   useEffect(() => {
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getRegionList().then((res) => {
       setRegionList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     if (id) {
       getMachineryDetail(id).then((res) => {
         form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
+      }).catch((err) => {
+        console.log(err.message)
       });
     }
   }, [id]);

src/pages/Machinery/Machinery/index.jsx

@@ -23,6 +23,8 @@ export default (props) => {
     deleteMachinery(id).then(() => {
       message.success('删除成功');
       actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
   //列表切换农机状态方法
@@ -41,7 +43,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            message.error(err);
+            console.log(err.message)
           });
       },
     });
@@ -49,9 +51,13 @@ export default (props) => {
   useEffect(() => {
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   const actions = () => [

src/pages/Machinery/MachineryType/index.jsx

@@ -41,7 +41,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            message.error(err);
+            console.log(err.message)
           });
       },
     });
@@ -56,6 +56,8 @@ export default (props) => {
     deleteMachineryType(val).then(() => {
       message.success('删除成功');
       actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
 

src/pages/Machinery/Org/index.jsx

@@ -45,6 +45,8 @@ export default (props) => {
       message.success('删除成功');
       setOrgId();
       handelReset();
+    }).catch((err) => {
+      console.log(err.message)
     });
   };
   // 刷新左侧列表

src/pages/Machinery/Person/index.jsx

@@ -99,6 +99,8 @@ export default (props) => {
         message.success(`修改成功`);
         onCancel();
         actionRef.current.reload();
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else {
       addUser(newData)
@@ -136,7 +138,7 @@ export default (props) => {
         actionRef.current.reload();
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   };
   //列表切换人员状态方法
@@ -155,7 +157,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            message.error(err);
+            console.log(err.message)
           });
       },
     });
@@ -167,6 +169,8 @@ export default (props) => {
       if (res.length !== 0) {
         setCurrentCheckbox(res.map((item) => item.roleId));
       }
+    }).catch((err) => {
+      console.log(err.message)
     });
     setEditRoleModal(true);
   };
@@ -191,7 +195,7 @@ export default (props) => {
           onRoleCancel();
         })
         .catch((err) => {
-          message.error(err);
+          console.log(err.message)
           setRLoading(false);
         });
     } else {
@@ -207,7 +211,7 @@ export default (props) => {
           onRoleCancel();
         })
         .catch((err) => {
-          message.error(err);
+          console.log(err.message)
           setRLoading(false);
         });
     }
@@ -219,6 +223,8 @@ export default (props) => {
     //获取账号默认密码
     getDefaultPassword().then((res) => {
       setPassWord(res);
+    }).catch((err) => {
+      console.log(err.message)
     });
     //获取合作社列表数据
     getCooperativeList().then((res) => {
@@ -227,10 +233,14 @@ export default (props) => {
         return { title: item.name, key: item.orgId };
       });
       setData(list);
+    }).catch((err) => {
+      console.log(err.message)
     });
     //获取角色列表数据
     getRoleList().then((res) => {
       setRoleList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   useEffect(() => {
@@ -241,6 +251,8 @@ export default (props) => {
         } else {
           form.setFieldsValue(res);
         }
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else {
       form.resetFields();

src/pages/MonitoringScreen/hook.js

@@ -8,9 +8,14 @@ export function useFullScreen(elRef) {
 
   const toggleFullScreen = useCallback((e) => {
     if (!document.fullscreenElement) {
-      elRef.current.requestFullscreen().then(() => {
-        setIsFullScreen(true);
-      });
+      elRef.current
+        .requestFullscreen()
+        .then(() => {
+          setIsFullScreen(true);
+        })
+        .catch((err) => {
+          console.log(err.message);
+        });
     }
   }, []);
 

src/pages/MonitoringScreen/index.jsx

@@ -139,6 +139,8 @@ export default (props) => {
       } else {
         setWeather('暂无天气信息');
       }
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
 

src/pages/OrderManage/JobWarning/detail.jsx

@@ -0,0 +1,66 @@
+import React, { useState, useEffect } from 'react';
+import { Card, Form, Button } from 'antd';
+import ProCard from '@ant-design/pro-card';
+import { getOrderDetail } from '@/services/order'
+import { history } from 'umi';
+
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const goBack = () => {
+  history.goBack();
+};
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [dispatch, setDispatch] = useState();
+
+  useEffect(() => {
+    getOrderDetail(id).then((res) => {
+      setDispatch(res)
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [id])
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }}>
+        <ProCard.TabPane key={1} tab="订单调度">
+          <Form {...formItemLayout}>
+            <FormItem label="订单号">
+              {dispatch?.personName}
+            </FormItem>
+            <FormItem label="客户姓名">
+              {dispatch?.personName}
+            </FormItem>
+            <FormItem label="联系电话">
+              {dispatch?.phone}
+            </FormItem>
+            <FormItem label="预约地址">
+              {dispatch?.address}
+            </FormItem>
+            <FormItem label="预约时间">
+              {dispatch?.appointmentDate}
+            </FormItem>
+            <FormItem label="合作社名">
+              {dispatch?.orgName}
+            </FormItem>
+            <FormItem label="农机类型">
+              {dispatch?.typeName}
+            </FormItem>
+            <FormItem label="农机">
+              {dispatch?.machinery}
+            </FormItem>
+            <FormItem label="农机手">
+              {dispatch?.person}
+            </FormItem>
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={() => goBack()}>
+                返回
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  );
+};

src/pages/OrderManage/JobWarning/index.jsx

@@ -1,3 +1,53 @@
+import { history } from 'umi';
+import { Button } from 'antd'
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+import { getOrderDetail, getWarnList } from '@/services/order'
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD') : '';
+};
 export default (props) => {
-  return <div>预警监管</div>;
+  const getOrderDetail = (val) => {
+    history.push(`./detail.jsx?id=${val}`);
+  }
+  const columns = [
+    {
+      title: '预警时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t) => formatterTime(t),
+      search: false,
+      width: 80
+    },
+    {
+      title: '消息',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      render: (_, record) => '您有 【' + record.orderNo + '】 将于 【' + formatterTime(record.appointmentDate) + '】 预约作业，请尽快处理'
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => getOrderDetail(record.orderId)}>
+          订单详情
+        </Button>
+      ],
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getWarnList}
+        columns={columns}
+        rowKey="orderId"
+        options={false}
+        search={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
 };

src/pages/OrderManage/OrderList/index.jsx

@@ -39,12 +39,22 @@ export default (props) => {
   useEffect(() => {
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   const columns = [
+    {
+      title: '订单号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      search: false
+    },
     {
       title: '合作社',
       dataIndex: 'orgId',

src/pages/OrderManage/dispatch.jsx

@@ -51,7 +51,9 @@ export default (props) => {
       } else {
         setDispatch({ ...dispatch, machineryId: e })
       }
-    }))
+    })).catch((err) => {
+      console.log(err.message)
+    });
   }
   const changeUser = (e) => {
     setDispatch({ ...dispatch, workerId: e })
@@ -76,17 +78,25 @@ export default (props) => {
       setDispatch(res)
       getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 }).then((res2) => {
         setMachineryList(res2.records)
-      })
+      }).catch((err) => {
+        console.log(err.message)
+      });
       getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
         setUserList(res3.records)
-      })
+      }).catch((err) => {
+        console.log(err.message)
+      });
       if (res.dispatchStatus == 1) {
         getdispatchId(id).then(res4 => {
           setDispatchId(res4.dispatchId)
           setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId })
-        })
+        }).catch((err) => {
+          console.log(err.message)
+        });
       }
-    })
+    }).catch((err) => {
+      console.log(err.message)
+    });
   }, [id])
   return (
     <Card>

src/pages/OrderManage/index.jsx

@@ -38,9 +38,13 @@ export default (props) => {
   useEffect(() => {
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   const columns = [

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -19,6 +19,8 @@ export default (props) => {
   useEffect(() => {
     getSetting().then((res) => {
       setData(res.records);
+    }).catch((err) => {
+      console.log(err.message)
     });
   }, []);
   return (

src/pages/SystemManagement/Region/index.jsx

@@ -27,6 +27,8 @@ export default (props) => {
         message.success(`修改成功`);
         onCancel();
         actionRef.current.reload();
+      }).catch((err) => {
+        console.log(err.message)
       });
     } else {
       addRegion(values)
@@ -59,7 +61,7 @@ export default (props) => {
         actionRef.current.reload();
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   };
   useEffect(() => {

src/pages/SystemManagement/UserRights/index.jsx

@@ -58,7 +58,7 @@ export default (props) => {
         actionRef.current.reload();
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   };
   //列表角色授权
@@ -74,7 +74,7 @@ export default (props) => {
         );
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   };
 
@@ -240,7 +240,7 @@ export default (props) => {
         onEmpowerCancel();
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
         setPLoading(false);
       });
   };
@@ -303,14 +303,14 @@ export default (props) => {
         setTreeList(list2);
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
     getPermissionList()
       .then((res) => {
         setPermissionAllList(res);
       })
       .catch((err) => {
-        message.error(err);
+        console.log(err.message)
       });
   }, []);
   useEffect(() => {

src/services/order.js

@@ -6,6 +6,12 @@ import request from '@/utils/request';
  * @returns
  */
 export const getOrderList = (params) => request('/order', { params });
+/**
+ * 查询预警列表
+ * @param {*} params
+ * @returns
+ */
+export const getWarnList = (params) => request('/order?isWarn=true', { params });
 
 /**
  * 查询订单详情