feats

src/pages/SystemManagement/Sensing/index.jsx

@@ -2,11 +2,11 @@ import React, { useState, useEffect, useRef } from 'react';
 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 { getMachineryList } from '@/services/machinery';
 import { getMachineryTypeList } from '@/services/machineryType';
+import { Link } from 'umi';
 
 const formatterTime = (val) => {
   return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
@@ -20,7 +20,6 @@ export default (props) => {
   const [loading, setLoading] = useState(false);
   const [machineryId, setMachineryId] = useState();
   const [device, setDeviceList] = useState();
-  const [deviceId, setDeviceId] = useState();
   const actionRef = useRef();
   const [machineryTypeList, setMachineryTypeList] = useState([]);
   const [typeId, setTypeId] = useState();
@@ -28,10 +27,6 @@ export default (props) => {
   const { Option } = Select;
   const FormItem = Form.Item;
 
-  const goBack = () => {
-    history.goBack();
-  };
-
   //列表编辑
   const handelEdit = (val) => {
     if (val.machineryId != null) {
@@ -42,7 +37,7 @@ export default (props) => {
         okText: '确认',
         cancelText: '取消',
         onOk () {
-          deleteDevice(machineryId)
+          deleteDevice(val.deviceId)
             .then(() => {
               setLoading(false);
               message.success(`解绑成功`);
@@ -66,8 +61,6 @@ export default (props) => {
 
   //绑定弹窗关闭
   const onCancel = () => {
-    setMachineryId();
-    form.resetFields();
     setEditModal(false);
   };
 
@@ -79,7 +72,7 @@ export default (props) => {
       setLoading(false);
       message.success(`绑定成功`);
       actionRef.current.reload();
-      goBack();
+      onCancel();
     });
   };
 
@@ -132,9 +125,17 @@ export default (props) => {
       title: '在线状态',
       dataIndex: 'onlineStatus',
       key: 'onlineStatus',
-      render: (_, record) => {
-        return record.onlineStatus === 1 ? '在线' : '离线';
+      valueEnum: {
+        1: {
+          text: '在线',
+        },
+        0: {
+          text: '离线',
+        },
       },
+      // render: (_, record) => {
+      //   return record.onlineStatus === 1 ? '在线' : '离线';
+      // },
     },
     {
       title: '注册时间',
@@ -155,12 +156,7 @@ export default (props) => {
       valueType: 'option',
       width: 160,
       render: (_, record) => [
-        <Button type="link" style={{ padding: 0 }} key={1}>
-          查看作业
-        </Button>,
-        <Button type="link" style={{ padding: 0 }} key={2}>
-          修改
-        </Button>,
+        <Link to={`/Machinery/OperationStatistics`} key={2} >查看作业</Link>,
         <Button style={{ padding: 0 }} type="link" key={3} onClick={() => handelEdit(record)}>
           {record.machineryId === null ? '绑定' : '解绑'}
         </Button>,