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://127.0.0.1:7080',
+      target: 'http://192.168.89.147:7080',
       // target: 'http://192.168.89.76:7080',
       // target: 'http://machine.njyunzhi.com',
       // 配置了这个可以从 http 代理到 https

src/pages/SystemManagement/Sensing/index.jsx

@@ -4,6 +4,8 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getDeviceList, deleteDevice, addDevice } from '@/services/device';
+import { addMachinery, getMachineryList } from '@/services/machinery';
+import { getMachineryTypeList } from '@/services/machineryType';
 import { queryTable } from '@/utils/request';
 
 const { Option } = Select;
@@ -19,9 +21,12 @@ export default (props) => {
   const [editModal, setEditModal] = useState(false);
   const [loading, setLoading] = useState(false);
   const [deviceId, setdeviceId] = useState();
-  const [machineryId, setmachineryId] = useState();
+  const [machineryId, setMachineryId] = useState();
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
   const actionRef = useRef();
-  const [newsTypeList, setNewsTypeList] = useState([]);
+  const [machineryList, setMachineryList] = useState([]);
+  const [typeId, setTypeId] = useState();
+  const e = 0;
   // useEffect(() => {
   //   if (regionId) {
   //   } else {
@@ -31,14 +36,14 @@ export default (props) => {
 
   //列表编辑
   const handelEdit = (val) => {
-    setmachineryId(val.machineryId);
+    setMachineryId(val.machineryId);
     form.setFieldsValue(val);
     setEditModal(true);
   };
 
   //绑定弹窗关闭
   const onCancel = () => {
-    setmachineryId();
+    setMachineryId();
     form.resetFields();
     setEditModal(false);
   };
@@ -46,7 +51,7 @@ export default (props) => {
   // 绑定提交
   const Submit = (values) => {
     setLoading(true);
-    addDevice(...values, machineryId).then(() => {
+    addDevice(values).then(() => {
       setLoading(false);
       message.success(`绑定成功`);
       onCancel();
@@ -65,16 +70,37 @@ export default (props) => {
     //       message.error(err.message || err);
     //     });
     // }
+    console.log(values, 'fangfang')
   };
 
   useEffect(() => {
-    getDeviceList().then((res) => {
-      setNewsTypeList(res.records);
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
+      setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
   }, []);
 
+  useEffect(() => {
+    if (typeId) {
+      getMachineryTypeList({ typeId }).then((e) => {
+        setMachineryTypeList(e.records);
+      }).catch((err) => {
+        console.log(err.message)
+      });
+    }
+  }, [typeId])
+
+  useEffect(() => {
+    if (machineryId) {
+      getMachineryList({ machineryId }).then((e) => {
+        setMachineryList(e.records);
+      }).catch((err) => {
+        console.log(err.message)
+      });
+    }
+  }, [machineryId])
+
   const columns = [
     {
       title: '行号',
@@ -140,9 +166,16 @@ export default (props) => {
         request={getDeviceList}
         columns={columns}
         actionRef={actionRef}
-        // rowKey="deviceId"
+        rowKey="deviceId"
         options={false}
-        // toolBarRender={actions}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+          >
+            +同步设备信息
+          </Button>,
+        ]}
         scroll={{ x: 1000 }}
       />
       <Modal
@@ -154,27 +187,30 @@ export default (props) => {
         maskClosable={false}
         destroyOnClose={true}
         footer={null}
+        machineryId={machineryId}
       >
-        <Form {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="农机分类" name="deviceType" rules={[{ required: true, message: '请选择农机分类' }]}
-          >
-            <Select allowClear style={{ width: '320px' }}>
-              {newsTypeList.map((item) => (
-                <Option value={item.deviceType} key={item.deviceType}>
-                  {item.deviceType}
+        <Form  {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="农机分类" 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}
                 </Option>
               ))}
             </Select>
           </FormItem>
-          <FormItem label="选择农机" name="deviceNo" rules={[{ required: true, message: '请选择农机名' }]}>
-            <Select allowClear style={{ width: '320px' }}>
-              {newsTypeList.map((item) => (
-                <Option value={item.deviceNo} key={item.deviceNo}>
-                  {item.deviceNo}
+          <FormItem label="选择农机" rules={[{ required: true, message: '请选择农机名' }]}>
+            <Select onChange={setMachineryId} allowClear style={{ width: '320px' }}>
+              {machineryList.map((item) => (
+                <Option value={item.machineryId} key={item.machineryId}>
+                  {item.name}
                 </Option>
               ))}
             </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' }}>
               取消

src/services/machineryType.js

@@ -1,37 +1,37 @@
-import request from '@/utils/request';
-
-/**
- * 保存农机类型
- * @param {*} data
- * @returns
- */
-export const addMachineryType = (data) => request('/machinery-type', { method: 'post', data });
-
-/**
- * 修改农机类型
- * @param {*} data
- * @returns
- */
-export const updateMachineryType = (id, data) =>
-  request(`/machinery-type/${id}`, { method: 'put', data });
-
-/**
- * 查询农机类型列表
- * @param {*} params
- * @returns
- */
-export const getMachineryTypeList = (params) => request('/machinery-type', { params });
-
-/**
- * 删除农机类型
- * @param {*} data
- * @returns
- */
-export const deleteMachineryType = (id) => request(`/machinery-type/${id}`, { method: 'delete' });
-
-/**
- * 查询农机类型详情
- * @param {*} params
- * @returns
- */
-export const getMachineryTypeDetail = (id) => request(`/machinery-type/${id}`);
+import request from '@/utils/request';
+
+/**
+ * 保存农机类型
+ * @param {*} data
+ * @returns
+ */
+export const addMachineryType = (data) => request('/machinery-type', { method: 'post', data });
+
+/**
+ * 修改农机类型
+ * @param {*} data
+ * @returns
+ */
+export const updateMachineryType = (id, data) =>
+  request(`/machinery-type/${id}`, { method: 'put', data });
+
+/**
+ * 查询农机类型列表
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryTypeList = (params) => request('/machinery-type', { params });
+
+/**
+ * 删除农机类型
+ * @param {*} data
+ * @returns
+ */
+export const deleteMachineryType = (id) => request(`/machinery-type/${id}`, { method: 'delete' });
+
+/**
+ * 查询农机类型详情
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryTypeDetail = (id) => request(`/machinery-type/${id}`);

src/services/usermachinery.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+/**
+ * 农机绑定列表
+ * @param {*} params
+ * @returns
+ */
+export const getUserMachineryList = (params) => request('/user-machinery', { params });
+
+/**
+ * 农机绑定保存
+ * @param {*} data
+ * @returns
+ */
+export const addUserMachinery = (id, data) => request(`/user/${id}/machinery`, { method: 'post', data });