Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

config/routes.js

@@ -20,7 +20,7 @@ export default [
   },
   {
     path: '/welcome',
-    name: 'welcome',
+    name: '工作台',
     icon: 'smile',
     component: './Welcome',
   },
@@ -63,6 +63,57 @@ export default [
     ],
   },
 
+  {
+    path: '/Machinery',
+    name: '农机管理',
+    icon: 'InsertRowLeftOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/Machinery/Cooperative',
+        name: '合作社列表',
+        component: './Machinery/Cooperative',
+      },
+      {
+        path: '/Machinery/Cooperative/edit.jsx',
+        name: '合作社编辑',
+        component: './Machinery/Cooperative/edit.jsx',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/MonitoringScreen',
+    name: '农机监控大屏',
+    icon: 'InsertRowLeftOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/MonitoringScreen/index.jsx',
+        name: '农机监控大屏',
+        component: './MonitoringScreen',
+      },
+      {
+        path: '/MonitoringScreen/detail.jsx',
+        name: '农机轨迹',
+        component: './MonitoringScreen/detail.jsx',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/MachineryGIS',
+    name: '农机GIS',
+    icon: 'InsertRowLeftOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/MachineryGIS/index.jsx',
+        name: '农机GIS',
+        component: './MachineryGIS',
+      },
+    ],
+  },
   {
     path: '/OrderManage',
     name: '订单调度',
@@ -70,12 +121,48 @@ export default [
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/OrderManage',
+        path: '/OrderManage/index.jsx',
         name: '订单调度',
         component: './OrderManage',
       },
     ],
   },
+  {
+    path: '/JobWarning',
+    name: '作业预警',
+    icon: 'InsertRowLeftOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/JobWarning/index.jsx',
+        name: '作业预警',
+        component: './JobWarning',
+      },
+    ],
+  },
+  {
+    path: '/JobStatistics',
+    name: '作业统计',
+    icon: 'InsertRowLeftOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/JobStatistics/Machinery',
+        name: '农机统计',
+        component: './JobStatistics/Machinery',
+      },
+      {
+        path: '/JobStatistics/Order',
+        name: '订单统计',
+        component: './JobStatistics/Order',
+      },
+      {
+        path: '/JobStatistics/RevenueExpenditure',
+        name: '收支统计',
+        component: './JobStatistics/RevenueExpenditure',
+      },
+    ],
+  },
   {
     path: '/Finance',
     name: '财务管理',

src/pages/JobStatistics/Machinery/index.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>农机统计</div>;
+};

src/pages/JobStatistics/Order/index.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>订单统计</div>;
+};

src/pages/JobStatistics/RevenueExpenditure/index.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>收支统计</div>;
+};

src/pages/JobWarning/index.jsx

@@ -0,0 +1,94 @@
+import React from 'react';
+// import { getPersonList, exportPersonList } from '@/services/person';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+
+export default (props) => {
+  const columns = [
+    {
+      title: '订单编号',
+      dataIndex: 'orderNum',
+      key: 'orderNum',
+    },
+    {
+      title: '农机名',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
+    },
+    {
+      title: '农机型号',
+      dataIndex: 'type',
+      key: 'type',
+    },
+    {
+      title: '农机数量',
+      dataIndex: 'machineryNum',
+      key: 'machineryNum',
+    },
+    {
+      title: '需求时间',
+      dataIndex: 'appointment_date',
+      key: 'appointment_date',
+    },
+    {
+      title: '农机价格',
+      dataIndex: 'price',
+      key: 'price',
+      search: false,
+    },
+    {
+      title: '押金',
+      dataIndex: 'deposit',
+      key: 'deposit',
+    },
+    {
+      title: '费用',
+      dataIndex: 'laborCost',
+      key: 'laborCost',
+    },
+    {
+      title: '状态',
+      dataIndex: 'state',
+      key: 'state',
+      valueType: 'select',
+      valueEnum: {
+        '': { text: '不限', status: 'Default' },
+        1: { text: '未付款' },
+        2: { text: '已付款' },
+        3: { text: '待确认' },
+        4: { text: '进行中' },
+        5: { text: '待评价' },
+        6: { text: '已评价' },
+        7: { text: '申请退款' },
+        8: { text: '已退款' },
+      },
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      search: false,
+      render: (t) => formatterTime(t),
+      width: 200,
+    },
+    // 显示待确认和需求时间差距2小时的订单  可以查看订单给农机手打电话和农户打电话
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        // request={getPersonList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="orderId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/pages/Machinery/Cooperative/edit.jsx

@@ -0,0 +1,154 @@
+import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card';
+import { useState, useEffect } from 'react';
+// import { getTagList } from '@/services/tag';
+// import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
+
+const { TextArea } = Input;
+const { Option } = Select;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+
+const goBack = () => {
+  history.goBack();
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [form] = Form.useForm();
+  const [listForm, setListForm] = useState({});
+  const [loading, setLoading] = useState(false);
+  const [imageList, setImageList] = useState([]);
+
+  const Submit = (data) => {
+    const typeList = (data.typeList || []).map((x) => {
+      return { ...x, targetId: id, targetType: 'tourist' };
+    });
+    setLoading(true);
+
+    // if (id) {
+    //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
+    //     setLoading(false);
+    //     message.success('数据更新成功');
+    //     goBack();
+    //   })
+    //     .catch(err => {
+    //       setLoading(false);
+    //       message.error(err.message || err);
+    //     });
+    // } else {
+    //   addAttaList({ ...data, imageList, typeList }).then((res) => {
+    //     setLoading(false);
+    //     message.success('数据保存成功');
+    //     history.replace(`/Attractions/Edit?id=${res.touristId}`)
+    //   })
+    //     .catch(err => {
+    //       setLoading(false);
+    //       message.error(err.message || err);
+    //     });
+    // }
+  };
+
+  //地址--占位
+  const [newLocName, setLocName] = useState('');
+  const [newAddress, setAddress] = useState('');
+
+  const selectTagList = (params) => {
+    // return getTagList({
+    // }).then((res) => {
+    // }).catch((err) => {
+    //   return {
+    //     success: false,
+    //   }
+    // })
+  };
+
+  const imageInput = (image) => {
+    return {
+      uid: image.imageId,
+      url: image.url,
+    };
+  };
+
+  const imageOutput = (image) => {
+    return {
+      imageId: image?.raw?.imageId,
+      shopId: id,
+      url: image.url,
+    };
+  };
+  useEffect(() => {
+    selectTagList();
+    // if (id) {
+    //   gettaTouristForm(id).then((res) => {
+    //     setListForm(res)
+    //     form.setFieldsValue(res)
+    //     setImageList(res?.imageList || [])
+    //   })
+    // }
+  }, [id]);
+
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }}>
+        <ProCard.TabPane key={1} tab="合作社编辑">
+          <Form {...formItemLayout} onFinish={Submit} form={form}>
+            <FormItem
+              label="合作社名称"
+              name="title"
+              rules={[{ required: true, message: '请输入合作社名称16个字符以内' }]}
+            >
+              <Input
+                placeholder="请输入合作社名称16个字符以内"
+                maxLength="16"
+                style={{ width: '350px' }}
+              />
+            </FormItem>
+            <FormItem
+              label="信用代码"
+              name="creditCode"
+              rules={[{ required: true, message: '请输入' }]}
+            >
+              <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="联系人"
+              name="name"
+              rules={[{ required: true, message: '请输入联系人' }]}
+            >
+              <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="联系方式"
+              name="phone"
+              rules={[{ required: true, message: '请输入联系方式' }]}
+            >
+              <Input placeholder="请输入联系方式" rows={4} style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="地址"
+              name="address"
+              rules={[{ required: true, message: '请输入地址' }]}
+            >
+              <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={() => goBack()}>
+                返回
+              </Button>
+              <Button
+                type="primary"
+                loading={loading}
+                htmlType="submit"
+                style={{ marginLeft: '4em' }}
+              >
+                保存
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  );
+};

src/pages/Machinery/Cooperative/index.jsx

@@ -0,0 +1,89 @@
+import React from 'react';
+import { history, Link } from 'umi';
+import { Button, Popconfirm, message, Tooltip } from 'antd';
+// import { getPersonList, exportPersonList } from '@/services/person';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+
+export default (props) => {
+  const columns = [
+    {
+      title: '合作社名',
+      dataIndex: 'title',
+      key: 'title',
+    },
+    {
+      title: '地址',
+      dataIndex: 'address',
+      key: 'address',
+    },
+    {
+      title: '联系人',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '农机数',
+      dataIndex: 'machineryNum',
+      key: 'machineryNum',
+    },
+    {
+      title: '员工数',
+      dataIndex: 'employeesNum',
+      key: 'employeesNum',
+    },
+    {
+      title: '完成订单数',
+      dataIndex: 'orderNum',
+      key: 'orderNum',
+      search: false,
+    },
+    {
+      title: '评分',
+      dataIndex: 'score',
+      key: 'score',
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <Link key={1} to={`./edit.jsx`}>
+          编辑
+        </Link>,
+        <Popconfirm
+          key={2}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.cooperativeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <a href="#">删除</a>
+        </Popconfirm>,
+      ],
+    },
+    // 农机列表点击进入详情页 下面是轨迹上面是时间
+  ];
+  const handleDelete = () => {};
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        // request={getPersonList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="cooperativeId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/pages/MachineryGIS/index.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>农机GIS</div>;
+};

src/pages/MonitoringScreen/detail.jsx

@@ -0,0 +1,3 @@
+export default (props) => {
+  return <div>监控轨迹</div>;
+};

src/pages/MonitoringScreen/index.jsx

@@ -0,0 +1,49 @@
+import React from 'react';
+import { history, Link } from 'umi';
+// import { getPersonList, exportPersonList } from '@/services/person';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+
+export default (props) => {
+  const columns = [
+    {
+      title: '农机名',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
+    },
+    {
+      title: '农机型号',
+      dataIndex: 'type',
+      key: 'type',
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: '300px',
+      render: (_, record) => [
+        <Link key={2} to={`./detail.jsx`}>
+          查看轨迹
+        </Link>,
+      ],
+    },
+    // 农机列表点击进入详情页 下面是轨迹上面是时间
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        // request={getPersonList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="machineryId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/pages/OrderManage/index.jsx

@@ -39,6 +39,7 @@ export default (props) => {
       title: '农机价格',
       dataIndex: 'price',
       key: 'price',
+      search: false,
     },
     {
       title: '押金',