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

src/pages/Machinery/Sensing/components/FeiFangForm.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import { Modal, Form, Input, Button } from 'antd';
+
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const FormItem = Form.Item;
+
+export default (props) => {
+  const { openfeiyang, onCancel, onFinish } = props;
+
+  const [form] = Form.useForm();
+  const [loading, setLoading] = React.useState(false);
+  return (
+    <Modal title="飞防" visible={openfeiyang} maskClosable={false} footer={null} onCancel={onCancel}>
+      <Form {...formItemLayout} onFinish={onFinish} form={form}>
+        <FormItem
+          label="设备编号"
+          name="deviceNo"
+          rules={[{ required: true, message: '请输入设备编号' }]}
+        >
+          <Input placeholder="请输入" />
+        </FormItem>
+        <FormItem label=" " colon={false}>
+          <Button type="default" onClick={onCancel}>
+            取消
+          </Button>
+          <Button type="primary" loading={loading} htmlType="Submit" style={{ marginLeft: '2em' }}>
+            确认
+          </Button>
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}

src/pages/Machinery/Sensing/components/List.jsx

@@ -3,6 +3,7 @@ import { Link } from 'umi';
 import moment from 'moment';
 import { Button, Popconfirm, Dropdown, Menu, message } from 'antd';
 import PageTable from '@/components/PageTable';
+import { } from '@/services/device';
 import { getDeviceList, syncShenSong } from '@/services/device';
 
 const formatterTime = (val) => {
@@ -17,8 +18,7 @@ const menus = (
 );
 
 const List = (props, ref) => {
-  const { onBindOpt } = props;
-
+  const { onBindOpt, onFeiFang } = props;
   const columns = [
     {
       title: '设备类型',
@@ -111,7 +111,6 @@ const List = (props, ref) => {
       reload: () => actionRef.current.reload(),
     };
   });
-
   return (
     <PageTable
       request={getDeviceList}
@@ -123,7 +122,7 @@ const List = (props, ref) => {
         <Button key={1} type="primary" loading={syncing} onClick={onSyncShenSong}>
           同步深松
         </Button>,
-        <Button key={3} type="primary">
+        <Button key={3} type="primary" onClick={() => { onFeiFang() }}>
           同步飞防
         </Button>,
       ]}

src/pages/Machinery/Sensing/index.jsx

@@ -4,11 +4,13 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { addDevice, deleteDevice } from '@/services/device';
 import List from './components/List';
 import MaBind from './components/MaBind';
+import FeiFangForm from './components/FeiFangForm';
 
 export default (props) => {
   // 绑定表单
 
   const [open, setOpen] = useState(false);
+  const [openfeiyang, setOpenFeiYang] = useState(false);
   const [device, setDevice] = useState();
   const listRef = useRef();
 
@@ -48,10 +50,16 @@ export default (props) => {
     }
   };
 
+  //同步飞防弹窗
+  const onFeiFang = () => {
+    setOpenFeiYang(true);
+  }
+
   return (
     <PageHeaderWrapper>
-      <List ref={listRef} onBindOpt={onBindOpt} />
+      <List ref={listRef} onBindOpt={onBindOpt} onFeiFang={onFeiFang} onSyncDevice={console.log} />
       <MaBind open={open} device={device} onCancel={() => setOpen(false)} onFinish={onBind} />
+      <FeiFangForm openfeiyang={openfeiyang} onCancel={() => setOpenFeiYang(false)} />
     </PageHeaderWrapper>
   );
 };