feats

src/pages/Machinery/JobList/index.jsx

@@ -26,12 +26,30 @@ export default (props) => {
       key: 'deviceNo',
       width: 340,
     },
+    {
+      title: '绑定农机',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
+      search: false,
+    },
     {
       title: '作业面积(亩)',
       dataIndex: 'jobArea',
       key: 'jobArea',
       search: false,
     },
+    {
+      title: '耕深(厘米)',
+      dataIndex: 'depth',
+      key: 'depth',
+      render: (t) => t || '-',
+    },
+    {
+      title: '平均喷量(升/亩)',
+      dataIndex: 'traffic',
+      key: 'traffic',
+      render: (t) => t || '-',
+    },
     {
       title: '作业时间',
       dataIndex: 'jobDate',
@@ -39,10 +57,9 @@ export default (props) => {
       search: false,
     },
     {
-      title: '绑定农机',
-      dataIndex: 'machineryName',
-      key: 'machineryName',
-      search: false,
+      title: '作业地点',
+      dataIndex: 'address',
+      key: 'address',
     },
   ];
 

src/pages/Machinery/Machinery/index.jsx

@@ -4,7 +4,12 @@ import { Button, Popconfirm, message, Select, Modal } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
-import { getMachineryList, deleteMachinery, updateMachinery, updateRepair } from '@/services/machinery';
+import {
+  getMachineryList,
+  deleteMachinery,
+  updateMachinery,
+  updateRepair,
+} from '@/services/machinery';
 import { getMachineryTypeList } from '@/services/machineryType';
 import { getCooperativeList } from '@/services/cooperative';
 
@@ -20,12 +25,14 @@ export default (props) => {
     history.push(`./machinery/Edit${queryStr}`);
   };
   const handleDelete = (id) => {
-    deleteMachinery(id).then(() => {
-      message.success('删除成功');
-      actionRef.current.reload();
-    }).catch((err) => {
-      console.log(err.message)
-    });
+    deleteMachinery(id)
+      .then(() => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
   };
   //列表切换农机状态方法
   const handleOK = (record, data) => {
@@ -43,22 +50,26 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            console.log(err.message)
+            console.log(err.message);
           });
       },
     });
   };
   useEffect(() => {
-    getCooperativeList({ pageSize: 999 }).then((res) => {
-      setCooperativeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-    getMachineryTypeList({ pageSize: 999 }).then((res) => {
-      setMachineryTypeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
+    getCooperativeList({ pageSize: 999 })
+      .then((res) => {
+        setCooperativeList(res.records);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
+    getMachineryTypeList({ pageSize: 999 })
+      .then((res) => {
+        setMachineryTypeList(res.records);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
   }, []);
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
@@ -80,8 +91,8 @@ export default (props) => {
               </Option>
             ))}
           </Select>
-        )
-      }
+        );
+      },
     },
     {
       title: '名称',
@@ -92,7 +103,7 @@ export default (props) => {
       title: '合作社',
       dataIndex: 'orgName',
       key: 'orgName',
-      search: false
+      search: false,
     },
     {
       title: '农机类型',
@@ -182,6 +193,16 @@ export default (props) => {
             删除
           </Button>
         </Popconfirm>,
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={4}
+          onClick={() =>
+            history.push(`/iot/OperationStatistics/detail?machineryId=${record.machineryId}`)
+          }
+        >
+          作业
+        </Button>,
       ],
     },
   ];

src/pages/Machinery/OperationStatistics/components/MaJob.jsx

@@ -26,11 +26,13 @@ export default (props) => {
       title: '耕深(厘米)',
       dataIndex: 'depth',
       key: 'depth',
+      render: (t) => t || '-',
     },
     {
       title: '平均喷量(升/亩)',
       dataIndex: 'traffic',
       key: 'traffic',
+      render: (t) => t || '-',
     },
     {
       title: '作业时间',

src/pages/Machinery/Sensing/components/List.jsx

@@ -64,12 +64,6 @@ const List = (props, ref) => {
       valueType: 'option',
       width: 280,
       render: (_, record) => [
-        <Link
-          to={`/Machinery/OperationStatistics?deviceType=${record.deviceType}&deviceNo=${record.deviceNo}`}
-          key={1}
-        >
-          作业
-        </Link>,
         record.machineryId === null ? (
           <Button key={2} type="link" onClick={() => onOperate(record, 'bind')}>
             绑定