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

src/components/ScreenBox/TitleBox/style.less

@@ -4,6 +4,7 @@
   align-items: center;
   padding: 11px 11px 9px 11px;
   border-radius: 4px;
+
   box-shadow: 0px 0px 10px 0px #3d81f0 inset;
 
   .TitleBox-ListBox {

src/pages/MonitoringScreen/DateCommponets.jsx

@@ -1,45 +0,0 @@
-
-
-
-import SquareBox from '@/components/ScreenBox/SquareBox'
-import TitleBox from '@/components/ScreenBox/TitleBox'
-import { Bar } from '@ant-design/plots';
-// import ba from './a.png'
-
-export default (props) => {
-
-  const data = [
-    {
-      year: '收割机',
-      value: 200,
-    },
-    {
-      year: '播种机',
-      value: 150,
-    },
-    {
-      year: '农药机',
-      value: 50,
-    },
-  ];
-  const config = {
-    data,
-    xField: 'value',
-    yField: 'year',
-    seriesField: 'year',
-
-    legend: {
-      position: 'top-left',
-    },
-    color: [' #FB9900', '#23E8AE', '#E63404'],
-  };
-
-  return (
-    <div  >
-      <TitleBox value='农机类型统计' />
-      <SquareBox>
-        <Bar  {...config} />
-      </SquareBox>
-    </div>
-  )
-}

src/pages/MonitoringScreen/DateCommponetsBottomLeft.jsx

@@ -0,0 +1,121 @@
+
+
+
+import SquareBox from '@/components/ScreenBox/SquareBox'
+import TitleBox from '@/components/ScreenBox/TitleBox'
+import { Column } from '@ant-design/plots';
+// import ba from './a.png'
+
+export default (props) => {
+
+
+  const style = {
+    bgd: {
+      width: '25vw',
+      display: 'inline-block',
+    }
+  }
+  const data = [
+    {
+      name: '预约',
+      NongType: '预约.',
+      sum: 18,
+    },
+    {
+      name: '作业',
+      NongType: '作业.',
+      sum: 28,
+    },
+    {
+      name: '闲置',
+      NongType: '闲置.',
+      sum: 100,
+    },
+    {
+      name: '离线',
+      NongType: '离线',
+      sum: 181,
+    },
+    {
+      name: '维修',
+      NongType: '维修',
+      sum: 147,
+    },
+
+  ];
+  const config = {
+    data,
+    isGroup: true,
+    xField: 'NongType',
+    yField: 'sum',
+    seriesField: 'name',
+    color: ['#F5CC5C', '#44F68B', '#51D4FF', '#B8B2A9', '#F55226'],
+    minColumnWidth: 26,
+    columnStyle: {
+      // fill: 'l(270) 0:rgba(225,225,225,0.0) 1:#FB9900',
+    },
+    color: ({ name }) => {
+      if (name == '预约') {
+
+        return `l(270) 0:rgba(225,225,225,0.0) 1:#F5CC5C`;
+
+
+      }
+      if (name == '作业') {
+
+        return `l(270) 0:rgba(225,225,225,0.0) 1:#44F68B`;
+
+
+      }
+      if (name == '闲置') {
+
+        return `l(270) 0:rgba(225,225,225,0.0) 1:#51D4FF`;
+
+
+      }
+      if (name == '离线') {
+
+        return `l(270) 0:rgba(225,225,225,0.0) 1:#B8B2A9`;
+
+
+      }
+      if (name == '维修') {
+
+        return `l(270) 0:rgba(225,225,225,0.0) 1:#F55226`;
+
+
+      }
+    },
+    /** 设置间距 */
+    // marginRatio: 0.1,
+    label: {
+      // 'top', 'middle', 'bottom'
+      // 可配置附加的布局方法
+      layout: [
+        // 柱形图数据标签位置自动调整
+        {
+          // type: 'interval-adjust-position',
+        }, // 数据标签防遮挡
+        {
+          // type: 'interval-hide-overlap',
+        }, // 数据标签文颜色自动调整
+        {
+          // type: 'adjust-color',
+        },
+      ],
+    },
+  };
+
+  return (
+    <div style={{ width: '100vw' }}>
+      <div style={style.bgd} >
+        <TitleBox value='农机状态统计' />
+        <SquareBox>
+          <Column  {...config} />
+        </SquareBox>
+      </div>
+
+    </div>
+
+  )
+}

src/pages/MonitoringScreen/DateCommponetsBottomRight.jsx

@@ -0,0 +1,85 @@
+
+
+
+import SquareBox from '@/components/ScreenBox/SquareBox'
+import TitleBox from '@/components/ScreenBox/TitleBox'
+import { Pie, G2 } from '@ant-design/plots';
+// import ba from './a.png'
+
+export default (props) => {
+
+  const G = G2.getEngine('canvas');
+  const style = {
+    bgd: {
+      width: '30vw',
+      display: 'inline-block',
+    }
+  }
+  const data = [
+    {
+      type: '收割机',
+      value: 27,
+    },
+    {
+      type: '播种机',
+      value: 25,
+    },
+    {
+      type: '农药机',
+      value: 18,
+    },
+    {
+      type: '其他',
+      value: 70,
+    }
+  ];
+  const config = {
+    color: ['#FB9900', '#355C9C', '#23E8AE', '#E63404'],
+    pieStyle: {
+      strokeOpacity: 0,
+      lineWidth: 0,
+    },
+    statistic: {
+      title: false,
+      content: {
+        style: {
+          whiteSpace: 'pre-wrap',
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+        },
+        content: ' ',
+      },
+    },
+    appendPadding: 10,
+    data,
+    angleField: 'value',
+    colorField: 'type',
+    innerRadius: 0.8,
+    radius: 0.75,
+    label: {
+      type: 'spider',
+      labelHeight: 28,
+      content: '{name}\n{percentage}',
+    },
+    interactions: [
+      {
+        type: 'element-selected',
+      },
+      {
+        type: 'element-active',
+      },
+    ],
+  };
+  return (
+    <div style={{ width: '100vw' }}>
+      <div style={style.bgd} >
+        <TitleBox value='农机类型统计' />
+        <SquareBox>
+          <Pie  {...config} />
+        </SquareBox>
+      </div>
+
+    </div>
+
+  )
+}

src/pages/MonitoringScreen/DateCommponetsLeft.jsx

@@ -0,0 +1,92 @@
+
+
+
+import SquareBox from '@/components/ScreenBox/SquareBox'
+import TitleBox from '@/components/ScreenBox/TitleBox'
+import { Bar } from '@ant-design/plots';
+
+export default (props) => {
+
+
+  const style = {
+    bgd: {
+      width: '25vw',
+      display: 'inline-block',
+    }
+  }
+  const data = [
+    {
+      year: '收割机',
+      value: 200,
+    },
+    {
+      year: '播种机',
+      value: 150,
+    },
+    {
+      year: '农药机',
+      value: 50,
+    },
+  ];
+
+  const config = {
+    maxBarWidth: 20,
+    data,
+    xField: 'value',
+    yField: 'year',
+    seriesField: 'year',
+
+    // color: [' #FB9900', '#23E8AE', '#E63404'],
+    color: ({ type, year }) => {
+      if (year == '收割机') {
+
+        return `l(0) 0:rgba(225,225,225,0.0) 1:#FB9900`;
+
+
+      }
+      if (year == '播种机') {
+
+        return `l(0) 0:rgba(225,225,225,0.0) 1:#23E8AE`;
+
+
+      }
+      if (year == '农药机') {
+
+        return `l(0) 0:rgba(225,225,225,0.0) 1:#E63404`;
+
+
+      }
+    },
+    barStyle: {
+      // fill: `l(0) 0:rgba(225,225,225,0.0) 1:#FB9900`,
+    },
+    legend: {
+      position: 'top-left',
+
+    },
+    statistic: {
+      style: {
+        // fill: '#FB9900',
+        // fill: '#23E8AE',
+        // fill: '#E63404',
+        fontSize: 10,
+        fontWeight: 60,
+        textAlign: 'center',
+        textBaseline: 'middle',
+      }
+    }
+  };
+
+  return (
+    <div style={{ width: '100vw' }}>
+      <div style={style.bgd} >
+        <TitleBox value='农机类型统计' />
+        <SquareBox>
+          <Bar  {...config} />
+        </SquareBox>
+      </div>
+
+    </div>
+
+  )
+}

src/pages/MonitoringScreen/index.jsx

@@ -6,7 +6,9 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { FullscreenOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
 import { useFullScreen } from './hook';
-import DateCommponets from './DateCommponets';
+import DateCommponetsLeft from './DateCommponetsLeft';
+import DateCommponetsBottomRight from './DateCommponetsBottomRight';
+import DateCommponetsBottomLeft from './DateCommponetsBottomLeft';
 import Styles from './style.less';
 import SquareBox from '@/components/ScreenBox/SquareBox';
 import ScreenHeader from '@/components/ScreenBox/ScreenHeader';

src/pages/SystemManagement/Administrator/index.jsx

@@ -1,8 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { history, Link } from 'umi';
-import { Button, Popconfirm, Modal, Form, Input, message, Radio, Select, Tooltip } from 'antd';
+import { Button, Popconfirm, Modal, Form, Input, message, Radio, Select } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { getRegionList, addRegion, deleteRegion, updateRegion } from '@/services/region';
 import { getCooperativeList } from '@/services/cooperative';
 import {
   getUserList,
@@ -20,26 +18,24 @@ const FormItem = Form.Item;
 const { Option } = Select;
 
 export default (props) => {
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
-      新增
-    </Button>,
-  ];
+  //编辑弹窗
   const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
   const [form] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
   const [loading, setLoading] = useState(false);
   const [userId, setuserId] = useState();
   const [password, setPassWord] = useState('');
-  const actionRef = useRef();
   const [cooperativeList, setCooperativeList] = useState([]);
 
+  //列表数据
+  const actionRef = useRef();
+
+  // 编辑弹窗的表单提交
   const Submit = (values) => {
     const newData = { ...values };
     if (!newData.sex && newData.sex !== 0) {
       newData.sex = 1;
     }
-    console.log(newData);
     setLoading(true);
     if (!/^1[0-9]{10}$/.test(newData.phone)) {
       message.warning('请输入正确的十一位手机号');
@@ -67,19 +63,23 @@ export default (props) => {
         });
     }
   };
-  const handelEdit = (val) => {
-    setuserId(val.userId);
-    form.setFieldsValue(val);
-    setEditModal(true);
-  };
+  //表单点击取消按钮
   const onCancel = () => {
     setuserId();
     form.resetFields();
     setEditModal(false);
   };
+  // 弹窗表单中机构搜索框改变事件目前没用
   const handelChange = () => {};
+
+  // 列表点击编辑按钮
+  const handelEdit = (val) => {
+    setuserId(val.userId);
+    setEditModal(true);
+  };
+  //列表点击删除按钮
   const handleDelete = (id) => {
-    deleteRegion(id)
+    deleteUser(id)
       .then(() => {
         message.success('删除成功');
         actionRef.current.reload();
@@ -88,34 +88,75 @@ export default (props) => {
         message.error(err);
       });
   };
+  //列表切换人员状态方法
+  const handleOK = (record, data) => {
+    const title = record.status
+      ? '您确定要将该人员状态变更为禁用吗? 禁用后该人员将不能登录'
+      : '您确定要将该人员状态变更为启用吗? 启用后该人员可以登录!';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        updateUser(record.userId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
+      },
+    });
+  };
   useEffect(() => {
+    //获取账号默认密码
     getDefaultPassword().then((res) => {
       setPassWord(res);
     });
+    //获取机构列表数据
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
     });
     if (userId) {
+      getUserDetail(userId).then((res) => {
+        if (res.orgId === '-1') {
+          form.setFieldsValue({ ...res, orgId: cooperativeList[0].orgId });
+        } else {
+          form.setFieldsValue(res);
+        }
+      });
     } else {
       form.resetFields();
     }
   }, [userId]);
+
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
+      新增
+    </Button>,
+  ];
   const columns = [
-    {
-      title: '登录账号',
-      dataIndex: 'loginName',
-      key: 'loginName',
-    },
     {
       title: '用户名',
       dataIndex: 'userName',
       key: 'userName',
     },
-
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      width: 80,
+      render: (_, record) => {
+        return record.sex === 1 ? '男' : record.sex === 0 ? '女' : '未知';
+      },
+      search: false,
+    },
     {
       title: '手机号',
       dataIndex: 'phone',
       key: 'phone',
+      width: 120,
     },
     {
       title: '邮箱',
@@ -126,6 +167,14 @@ export default (props) => {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
+      renderFormItem: () => {
+        return (
+          <Select placeholder="请选择">
+            <Option value={1}>启用</Option>
+            <Option value={0}>禁用</Option>
+          </Select>
+        );
+      },
       render: (_, record) => {
         return record.status === 1 ? '启用' : '未启用';
       },
@@ -134,11 +183,14 @@ export default (props) => {
       title: '操作',
       valueType: 'option',
       render: (_, record) => [
-        <a key={1} onClick={() => handelEdit(record)}>
+        <Button type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '启用' : '禁用'}
+        </Button>,
+        <a key={2} onClick={() => handelEdit(record)}>
           编辑
         </a>,
         <Popconfirm
-          key={2}
+          key={3}
           title="您是否确认删除 ?"
           onConfirm={() => handleDelete(record.userId)}
           okText="确定"
@@ -199,7 +251,7 @@ export default (props) => {
           <FormItem label="邮箱" name="email" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="所属机构" name="orgId">
+          <FormItem label="所属机构" name="orgId" rules={[{ required: true, message: '请输入' }]}>
             <Search placeholder="请选择机构" onChange={handelChange} />
             {/* <Select
               placeholder="请选择机构"
@@ -214,6 +266,12 @@ export default (props) => {
               ))}
             </Select> */}
           </FormItem>
+          <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
+            <Select placeholder="请选择是否启用">
+              <Option value={1}>启用</Option>
+              <Option value={0}>禁用</Option>
+            </Select>
+          </FormItem>
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={onCancel}>
               取消