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

config/proxy.js

     // 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

   const actionRef = useRef();
   const [machineryList, setMachineryList] = useState([]);
   const [typeId, setTypeId] = useState();
-  const e = 0;
+
   // useEffect(() => {
   //   if (regionId) {
   //   } else {
   //   }
   // }, [regionId]);
 
+  const handleChange = (e) => {
+    getMachineryTypeList().then((e) => {
+      setTypeId(e.records);
+      console.log('qqqqqqqq', e.records);
+    })
+  };
+
   //列表编辑
   const handelEdit = (val) => {
     setMachineryId(val.machineryId);
     }).catch((err) => {
       console.log(err.message)
     });
+    getMachineryList({ pageSize: 999 }).then((e) => {
+      setMachineryList(e.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
   }, []);
 
   useEffect(() => {
       }).catch((err) => {
         console.log(err.message)
       });
-    }
-  }, [typeId])
-
-  useEffect(() => {
-    if (machineryId) {
       getMachineryList({ machineryId }).then((e) => {
         setMachineryList(e.records);
       }).catch((err) => {
         console.log(err.message)
       });
     }
-  }, [machineryId])
+  }, [typeId])
 
   const columns = [
     {
       >
         <Form  {...formItemLayout} onFinish={Submit} form={form}>
           <FormItem label="农机分类" rules={[{ required: true, message: '请选择农机分类' }]}>
-            <Select value={typeId} onChange={setTypeId} allowClear style={{ width: '320px' }}>
+            <Select value={typeId} onChange={handleChange} allowClear style={{ width: '320px' }}>
               {machineryTypeList.map((item) => (
                 <Option value={item.typeId} key={item.typeId}>
                   {item.name}
             </Select>
           </FormItem>
           <FormItem label="选择农机" rules={[{ required: true, message: '请选择农机名' }]}>
-            <Select onChange={setMachineryId} allowClear style={{ width: '320px' }}>
+            <Select value={machineryId} onChange={setMachineryId} allowClear style={{ width: '320px' }}>
               {machineryList.map((item) => (
                 <Option value={item.machineryId} key={item.machineryId}>
                   {item.name}

src/pages/SystemManagement/Subsoiler/index.jsx

           <Descriptions.Item label="接口域名">inter-query.huidatech.cn</Descriptions.Item>
           <Descriptions.Item label="账号密码">njsyzkj0641</Descriptions.Item>
           <Descriptions.Item label="密码">dTX7o3</Descriptions.Item>
-          <Descriptions.Item label="厂家ID">njsyzkj_hd_20221014155214766</Descriptions.Item>
+          <Descriptions.Item label="厂家ID">njsyzkj_hd_20221014155214776</Descriptions.Item>
           <Descriptions.Item label="推送GUID">401cf971587342619ffcf7bbad1ef92d</Descriptions.Item>
           <Descriptions.Item label="大写缩写">njsyzkj</Descriptions.Item>
           <Descriptions.Item label="公司名称">南京市云致科技服务有限公司</Descriptions.Item>

src/services/usermachinery.js

-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 });