feats

src/pages/Machinery/OperationStatistics/components/search/Form.jsx

@@ -18,11 +18,13 @@ export default (props) => {
     form.resetFields();
   };
 
+  const offset = (3 - (props.children.length % 4)) * 6;
+
   return (
     <Form form={form} initialValues={initialValues} onFinish={onFinish}>
       <Row gutter={24}>
         {props.children}
-        <Col span={6} offset={18} style={{ textAlign: 'right' }}>
+        <Col span={6} offset={offset} style={{ textAlign: 'right' }}>
           <Button onClick={onReset}>重置</Button>
           <Button type="primary" htmlType="submit" style={{ margin: '0 8px' }}>
             查询

src/pages/Machinery/OperationStatistics/components/search/index.jsx

@@ -45,6 +45,15 @@ export default (props) => {
         <FormItem name="orgName" label="合作社">
           <Input placeholder="请输入" />
         </FormItem>
+        <FormItem name="userName" label="人员">
+          <Input placeholder="请输入" />
+        </FormItem>
+        <FormItem name="phone" label="手机">
+          <Input placeholder="请输入" />
+        </FormItem>
+        <FormItem name="machineryName" label="农机">
+          <Input placeholder="请输入" />
+        </FormItem>
         <FormItem name="deviceNo" label="设备编号">
           <Input placeholder="请输入" />
         </FormItem>

src/pages/Machinery/OperationStatistics/index.jsx

@@ -12,10 +12,19 @@ export default (props) => {
       key: 'orgName',
     },
     {
-      title: '设备编号',
-      dataIndex: 'deviceNo',
-      key: 'deviceNo',
-      width: 340,
+      title: '人员',
+      dataIndex: 'userName',
+      key: 'userName',
+    },
+    {
+      title: '手机',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '农机',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
     },
     {
       title: '设备类型',
@@ -23,6 +32,11 @@ export default (props) => {
       key: 'deviceKind',
       render: (t) => (t === 'shensong' ? '深松' : t === 'feifang' ? '飞防' : '-'),
     },
+    {
+      title: '设备编号',
+      dataIndex: 'deviceNo',
+      key: 'deviceNo',
+    },
     {
       title: '作业面积(亩)',
       dataIndex: 'jobArea',
@@ -30,14 +44,8 @@ export default (props) => {
     },
     {
       title: '作业时间',
-      dataIndex: 'jobDate',
-      key: 'jobDate',
-    },
-    {
-      title: '绑定农机',
-      dataIndex: 'machineryName',
-      key: 'machineryName',
-      search: false,
+      dataIndex: 'jobTime',
+      key: 'jobTime',
     },
   ];
 

src/pages/MonitoringScreen2/index.jsx

@@ -139,9 +139,9 @@ export default (props) => {
         </div>
         <div className={classNames(Styles['grail-container'], Styles['mg-tp-30'])}>
           <div className={classNames(Styles['grail-content'], Styles['pd-lr-40'])}>
-            {/* <div className={Styles['statis-container']}>
+            <div className={Styles['statis-container']}>
               <Banner />
-            </div> */}
+            </div>
             <Map onReady={onMapReady}>
               <div
                 className={Styles['map-addon']}

src/utils/request.js

@@ -51,7 +51,7 @@ async function responseInterceptor(response, ctx) {
     const data = await response.clone().blob();
     const content = response.headers.get('content-disposition');
     const fileName = content.replace('attachment;filename=', '');
-    downloadBlob(data, decodeURIComponent(fileName));
+    return downloadBlob(data, decodeURIComponent(fileName));
   }
 
   return response;