feats

config/routes.js

@@ -153,6 +153,12 @@ export default [
         name: '作业统计',
         component: './Machinery/OperationStatistics',
       },
+      {
+        path: '/Machinery/OperationStatistics/Detail',
+        name: '作业详情',
+        component: './Machinery/OperationStatistics/Detail',
+        hideInMenu: true,
+      },
     ],
   },
   {

src/pages/Machinery/OperationStatistics/Detail.jsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Card, Divider } from 'antd';
+import Summary from './components/Summary';
+import Machines from './components/Machines';
+
+export default (props) => {
+  const { location } = props;
+  const { user: userId } = location.query || {};
+
+  return (
+    <PageHeaderWrapper>
+      <Card>
+        <p>
+          <Summary userId={userId} />
+        </p>
+        <Divider />
+        <p>
+          <Machines userId={userId} />
+        </p>
+      </Card>
+    </PageHeaderWrapper>
+  );
+};

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

@@ -0,0 +1,32 @@
+import React from 'react';
+import { Spin, Tabs } from 'antd';
+import { getMachineryListByUser } from '@/services/device';
+
+export default (props) => {
+  const { userId } = props;
+
+  const [loading, setLoading] = React.useState(false);
+  const [machines, setMachines] = React.useState([]);
+
+  React.useEffect(() => {
+    if (userId) {
+      setLoading(true);
+      getMachineryListByUser(userId)
+        .then((res) => {
+          setMachines(res);
+          setLoading(false);
+        })
+        .catch((err) => {
+          console.error(err);
+          setLoading(false);
+        });
+    }
+  }, [userId]);
+
+  return (
+    <Spin spinning={loading}>
+      <h3 style={{ fontWeight: 700 }}>作业信息</h3>
+      <Tabs></Tabs>
+    </Spin>
+  );
+};

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

@@ -0,0 +1,34 @@
+import React from 'react';
+import { Descriptions, Spin } from 'antd';
+import { getUserDetail } from '@/services/user';
+
+export default (props) => {
+  const { userId } = props;
+
+  const [loading, setLoading] = React.useState(false);
+  const [user, setUser] = React.useState({});
+
+  React.useEffect(() => {
+    if (userId) {
+      setLoading(true);
+      getUserDetail(userId)
+        .then((res) => {
+          setUser(res);
+          setLoading(false);
+        })
+        .catch((err) => {
+          console.error(err);
+          setLoading(false);
+        });
+    }
+  }, [userId]);
+
+  return (
+    <Spin spinning={loading}>
+      <Descriptions title="用户信息">
+        <Descriptions.Item label="姓名">{user.userName}</Descriptions.Item>
+        <Descriptions.Item label="电话">{user.phone}</Descriptions.Item>
+      </Descriptions>
+    </Spin>
+  );
+};

src/pages/Machinery/OperationStatistics/index.jsx

@@ -1,4 +1,5 @@
 import React, { useState, useRef, useMemo } from 'react';
+import { Link } from 'umi';
 import { Button, Card, Table, message, Descriptions, Col, Row } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getDeviceJobByOrg, exportDeviceJobByOrg } from '@/services/job';
@@ -15,6 +16,9 @@ export default (props) => {
       title: '人员',
       dataIndex: 'userName',
       key: 'userName',
+      render: (t, record) => (
+        <Link to={`/Machinery/OperationStatistics/detail?user=${record.userId}`}>{t || '-'}</Link>
+      ),
     },
     {
       title: '手机',

src/services/device.js

@@ -51,3 +51,10 @@ export const addMachinery = (data) => request('/device', { method: 'post', data
  * @returns
  */
 export const deleteDevice = (id) => request(`/device/${id}`, { method: 'delete' });
+
+/**
+ * 获取用户作业农机列表
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryListByUser = (userId) => request(`/device-job/user/${userId}/machinery`);

src/utils/request.js

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