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

config/proxy.js

@@ -11,7 +11,7 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.147:7080',
+      target: 'http://192.168.89.76:7080',
       // target: 'http://192.168.89.76:7080',
       // target: 'http://machine.njyunzhi.com',
       // 配置了这个可以从 http 代理到 https

src/pages/SystemManagement/Sensing/index.jsx

@@ -1,18 +1,16 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Button, Select, Modal, Form, Input, message } from 'antd';
+import { Button, Modal, Select, Form, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
+import { history } from 'umi';
 import PageTable from '@/components/PageTable';
 import { getDeviceList, deleteDevice, addDevice } from '@/services/device';
-import { addMachinery, getMachineryList } from '@/services/machinery';
+import { getMachineryList } from '@/services/machinery';
 import { getMachineryTypeList } from '@/services/machineryType';
-import { queryTable } from '@/utils/request';
 
-const { Option } = Select;
 const formatterTime = (val) => {
   return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
 };
-const FormItem = Form.Item;
 
 export default (props) => {
   // 绑定表单
@@ -20,32 +18,50 @@ export default (props) => {
   const [form] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [deviceId, setdeviceId] = useState();
   const [machineryId, setMachineryId] = useState();
-  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [device, setDeviceList] = useState();
+  const [deviceId, setDeviceId] = useState();
   const actionRef = useRef();
-  const [machineryList, setMachineryList] = useState([]);
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
   const [typeId, setTypeId] = useState();
+  const [machineryList, setMachineryList] = useState([]);
+  const { Option } = Select;
+  const FormItem = Form.Item;
 
-  // useEffect(() => {
-  //   if (regionId) {
-  //   } else {
-  //     form.resetFields();
-  //   }
-  // }, [regionId]);
-
-  const handleChange = (e) => {
-    getMachineryTypeList().then((e) => {
-      setTypeId(e.records);
-      console.log('qqqqqqqq', e.records);
-    })
+  const goBack = () => {
+    history.goBack();
   };
 
   //列表编辑
   const handelEdit = (val) => {
-    setMachineryId(val.machineryId);
+    if (val.machineryId != null) {
+      setEditModal(false);
+      const title = '确认当前设备要解绑"' + val.machineryName + '"农机设备吗？';
+      Modal.confirm({
+        title: title,
+        okText: '确认',
+        cancelText: '取消',
+        onOk () {
+          deleteDevice(machineryId)
+            .then(() => {
+              setLoading(false);
+              message.success(`解绑成功`);
+              onCancel();
+              actionRef.current.reload();
+
+            })
+            .catch((err) => {
+              setLoading(false);
+              message.error(err.message || err);
+            });
+        }
+      })
+    } else {
+      setEditModal(true);
+      setDeviceList(val);
+    }
+
     form.setFieldsValue(val);
-    setEditModal(true);
   };
 
   //绑定弹窗关闭
@@ -57,27 +73,14 @@ export default (props) => {
 
   // 绑定提交
   const Submit = (values) => {
+    let params = { ...device, ...values };
     setLoading(true);
-    addDevice(values).then(() => {
+    addDevice(params).then((res) => {
       setLoading(false);
       message.success(`绑定成功`);
-      onCancel();
       actionRef.current.reload();
+      goBack();
     });
-    // if (machineryId) {
-    //   deleteDevice(machineryId)
-    //     .then(() => {
-    //       setLoading(false);
-    //       message.success(`解绑成功`);
-    //       onCancel();
-    //       actionRef.current.reload();
-    //     })
-    //     .catch((err) => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // }
-    console.log(values, 'fangfang')
   };
 
   useEffect(() => {
@@ -86,26 +89,17 @@ export default (props) => {
     }).catch((err) => {
       console.log(err.message)
     });
-    getMachineryList({ pageSize: 999 }).then((e) => {
-      setMachineryList(e.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
   }, []);
 
   useEffect(() => {
     if (typeId) {
-      getMachineryTypeList({ typeId }).then((e) => {
-        setMachineryTypeList(e.records);
-      }).catch((err) => {
-        console.log(err.message)
-      });
-      getMachineryList({ machineryId }).then((e) => {
+      getMachineryList({ typeId }).then((e) => {
         setMachineryList(e.records);
       }).catch((err) => {
         console.log(err.message)
       });
     }
+
   }, [typeId])
 
   const columns = [
@@ -124,7 +118,14 @@ export default (props) => {
       title: '设备类型',
       dataIndex: 'deviceType',
       key: 'deviceType',
-      valueType: 'select',
+      valueEnum: {
+        shensong: {
+          text: '深松',
+        },
+        feifang: {
+          text: '飞防',
+        },
+      },
       // request: () => queryTable(getDeviceList)(),
     },
     {
@@ -154,10 +155,10 @@ export default (props) => {
       valueType: 'option',
       width: 160,
       render: (_, record) => [
-        <Button type="link" style={{ padding: 0 }} key={1} onClick={() => handelEdit(record)}>
+        <Button type="link" style={{ padding: 0 }} key={1}>
           查看作业
         </Button>,
-        <Button type="link" style={{ padding: 0 }} key={2} onClick={() => handelEdit(record)}>
+        <Button type="link" style={{ padding: 0 }} key={2}>
           修改
         </Button>,
         <Button style={{ padding: 0 }} type="link" key={3} onClick={() => handelEdit(record)}>
@@ -197,8 +198,8 @@ export default (props) => {
         machineryId={machineryId}
       >
         <Form  {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="农机分类" rules={[{ required: true, message: '请选择农机分类' }]}>
-            <Select value={typeId} onChange={handleChange} allowClear style={{ width: '320px' }}>
+          <FormItem label="农机分类" name="typeId" rules={[{ required: true, message: '请选择农机分类' }]}>
+            <Select value={typeId} onChange={setTypeId} allowClear style={{ width: '320px' }}>
               {machineryTypeList.map((item) => (
                 <Option value={item.typeId} key={item.typeId}>
                   {item.name}
@@ -206,7 +207,7 @@ export default (props) => {
               ))}
             </Select>
           </FormItem>
-          <FormItem label="选择农机" rules={[{ required: true, message: '请选择农机名' }]}>
+          <FormItem label="选择农机" name="machineryId" rules={[{ required: true, message: '请选择农机名' }]}>
             <Select value={machineryId} onChange={setMachineryId} allowClear style={{ width: '320px' }}>
               {machineryList.map((item) => (
                 <Option value={item.machineryId} key={item.machineryId}>
@@ -215,9 +216,6 @@ export default (props) => {
               ))}
             </Select>
           </FormItem>
-          {/* <FormItem label="选择农机" request={getMachineryList}>
-            <Input placeholder='请输入农机名称' name="name" rules={[{ required: true }]} />
-          </FormItem> */}
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={onCancel} style={{ marginTop: '2em', marginLeft: '4em' }}>
               取消