feats

config/routes.js

@@ -136,6 +136,7 @@ export default [
         path: '/Machinery/GIS',
         name: '农机GIS',
         component: './Machinery/GIS',
+        hideInMenu: true,
       },
       {
         path: '/Machinery/GIS/detail.jsx',
@@ -145,17 +146,17 @@ export default [
       },
       {
         path: '/Machinery/JobList',
-        name: '作业列表',
+        name: '设备作业列表',
         component: './Machinery/JobList',
       },
       {
         path: '/Machinery/OperationStatistics',
-        name: '作业统计',
+        name: '设备作业统计',
         component: './Machinery/OperationStatistics',
       },
       {
         path: '/Machinery/OperationStatistics/Detail',
-        name: '作业详情',
+        name: '设备作业详情',
         component: './Machinery/OperationStatistics/Detail',
         hideInMenu: true,
       },

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

@@ -5,7 +5,7 @@ import Form, { FormItem } from './Form';
 
 const { RangePicker } = DatePicker;
 
-const initialValues = {
+const initValues = {
   jobDate: [moment().startOf('year'), moment()],
 };
 
@@ -21,7 +21,9 @@ const options = [
 ];
 
 export default (props) => {
-  const { onFinish } = props;
+  const { onFinish, initial = {} } = props;
+
+  const initialValues = { ...initValues, ...initial };
 
   const handleFinish = (values) => {
     // 转换日期格式
@@ -43,22 +45,22 @@ export default (props) => {
     <Card>
       <Form onFinish={handleFinish} initialValues={initialValues}>
         <FormItem name="orgName" label="合作社">
-          <Input placeholder="请输入" />
+          <Input placeholder="请输入" allowClear />
         </FormItem>
         <FormItem name="userName" label="人员">
-          <Input placeholder="请输入" />
+          <Input placeholder="请输入" allowClear />
         </FormItem>
         <FormItem name="phone" label="手机">
-          <Input placeholder="请输入" />
+          <Input placeholder="请输入" allowClear />
         </FormItem>
         <FormItem name="machineryName" label="农机">
-          <Input placeholder="请输入" />
+          <Input placeholder="请输入" allowClear />
         </FormItem>
         <FormItem name="deviceNo" label="设备编号">
-          <Input placeholder="请输入" />
+          <Input placeholder="请输入" allowClear />
         </FormItem>
         <FormItem name="deviceKind" label="设备类型">
-          <Select options={options} />
+          <Select options={options} allowClear />
         </FormItem>
         <FormItem name="jobDate" label="作业时间">
           <RangePicker />

src/pages/Machinery/OperationStatistics/index.jsx

@@ -6,6 +6,9 @@ import { getDeviceJobByOrg, exportDeviceJobByOrg } from '@/services/job';
 import Search from './components/search';
 
 export default (props) => {
+  const { location } = props;
+  const { deviceType, deviceNo } = location.query || {};
+
   const columns = [
     {
       title: '合作社',
@@ -122,7 +125,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <div style={{ marginBottom: '16px' }}>
-        <Search onFinish={onSearch} />
+        <Search initial={{ deviceKind: deviceType, deviceNo }} onFinish={onSearch} />
       </div>
       <Card loading={loading}>
         <Row>

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

@@ -1,10 +1,10 @@
 import React from 'react';
 import { Link } from 'umi';
 import moment from 'moment';
-import { Button, Popconfirm, Dropdown, Menu } from 'antd';
+import { Button, Popconfirm, Dropdown, Menu, message } from 'antd';
 import PageTable from '@/components/PageTable';
-import { getDeviceList } from '@/services/device';
 import { } from '@/services/device';
+import { getDeviceList, syncShenSong } from '@/services/device';
 
 const formatterTime = (val) => {
   return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
@@ -18,8 +18,7 @@ const menus = (
 );
 
 const List = (props, ref) => {
-  const { onBindOpt, onSyncDevice, onFeiFang } = props;
-
+  const { onBindOpt, onFeiFang } = props;
   const columns = [
     {
       title: '设备类型',
@@ -91,8 +90,22 @@ const List = (props, ref) => {
     },
   ];
 
+  const [syncing, setSyncing] = React.useState(false);
   const actionRef = React.useRef();
 
+  const onSyncShenSong = () => {
+    setSyncing(true);
+    syncShenSong()
+      .then((res) => {
+        setSyncing(false);
+        actionRef.current.reload();
+        message.success('同步完成');
+      })
+      .catch(() => {
+        setSyncing(false);
+      });
+  };
+
   React.useImperativeHandle(ref, () => {
     return {
       reload: () => actionRef.current.reload(),
@@ -106,7 +119,7 @@ const List = (props, ref) => {
       rowKey={(row) => `${row.deviceType}-${row.deviceNo}`}
       options={false}
       toolBarRender={() => [
-        <Button key={1} type="primary">
+        <Button key={1} type="primary" loading={syncing} onClick={onSyncShenSong}>
           同步深松
         </Button>,
         <Button key={3} type="primary" onClick={() => { onFeiFang() }}>

src/services/device.js

@@ -58,3 +58,9 @@ export const deleteDevice = (id) => request(`/device/${id}`, { method: 'delete'
  * @returns
  */
 export const getMachineryListByUser = (userId) => request(`/device-job/user/${userId}/machinery`);
+
+/**
+ * 同步深松设备
+ * @returns
+ */
+export const syncShenSong = () => request('/raw-device/sync', { method: 'put' });