Yansen 2 vuotta sitten
vanhempi
commit
b5357bcc70

+ 4
- 1
src/pages/Machinery/Sensing/components/List.jsx Näytä tiedosto

@@ -62,7 +62,7 @@ const List = (props, ref) => {
62 62
     {
63 63
       title: '操作',
64 64
       valueType: 'option',
65
-      width: 240,
65
+      width: 280,
66 66
       render: (_, record) => [
67 67
         <Link
68 68
           to={`/Machinery/OperationStatistics?deviceType=${record.deviceType}&deviceNo=${record.deviceNo}`}
@@ -90,6 +90,9 @@ const List = (props, ref) => {
90 90
         >
91 91
           <a href="#">删除</a>
92 92
         </Popconfirm>,
93
+        <Button key={5} type="link" onClick={() => onOperate(record, 'syncLoc')}>
94
+          同步位置
95
+        </Button>,
93 96
       ],
94 97
     },
95 98
   ];

+ 13
- 4
src/pages/Machinery/Sensing/index.jsx Näytä tiedosto

@@ -40,9 +40,9 @@ export default (props) => {
40 40
   };
41 41
 
42 42
   // 解绑
43
-  const unBind = (deviceId) => {
43
+  const unBind = ({ deviceType, deviceNo }) => {
44 44
     const hide = message.loading('请稍候...', 0);
45
-    deleteDevice(deviceId)
45
+    deleteDevice({ deviceType, deviceNo })
46 46
       .then(() => {
47 47
         hide();
48 48
         message.success(`解绑成功`);
@@ -79,7 +79,9 @@ export default (props) => {
79 79
         setOpen(false);
80 80
         listRef.current.reload();
81 81
       })
82
-      .catch((err) => {});
82
+      .catch((err) => {
83
+        setSyncing2(false);
84
+      });
83 85
   };
84 86
 
85 87
   // 同步深松
@@ -102,6 +104,10 @@ export default (props) => {
102 104
     setOpen(true);
103 105
   };
104 106
 
107
+  const syncLoc = (row) => {
108
+    const hide = message.loading('请稍候...', 0);
109
+  };
110
+
105 111
   // 设备操作
106 112
   const onOperate = (row, act) => {
107 113
     actRef.current = act;
@@ -112,7 +118,10 @@ export default (props) => {
112 118
         setOpen(true);
113 119
         break;
114 120
       case 'unbind':
115
-        unBind(row.deviceId);
121
+        unBind(row);
122
+        break;
123
+      case 'syncLoc':
124
+        syncLoc(row);
116 125
         break;
117 126
       case 'delete':
118 127
         onDelete(row);

+ 1
- 1
src/services/device.js Näytä tiedosto

@@ -50,7 +50,7 @@ export const addMachinery = (data) => request('/device', { method: 'post', data
50 50
  * @param {*} data
51 51
  * @returns
52 52
  */
53
-export const deleteDevice = (id) => request(`/device/${id}`, { method: 'delete' });
53
+export const deleteDevice = (params) => request(`/device`, { method: 'delete', params });
54 54
 
55 55
 /**
56 56
  * 获取用户作业农机列表