李志伟 2 年前
父节点
当前提交
c19d5b7461
共有 3 个文件被更改,包括 13 次插入3 次删除
  1. 3
    1
      config/proxy.js
  2. 2
    2
      src/pages/Machinery/Machinery/index.jsx
  3. 8
    0
      src/services/machinery.js

+ 3
- 1
config/proxy.js 查看文件

11
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
11
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
12
     '/api/': {
12
     '/api/': {
13
       // 要代理的地址
13
       // 要代理的地址
14
-      target: 'http://192.168.89.147:7080',
14
+      // target: 'http://192.168.89.147:7080',
15
+      // target: 'http://192.168.89.25:7080',
16
+      target: 'http://machine.njyunzhi.com',
15
       // 配置了这个可以从 http 代理到 https
17
       // 配置了这个可以从 http 代理到 https
16
       // 依赖 origin 的功能可能需要这个,比如 cookie
18
       // 依赖 origin 的功能可能需要这个,比如 cookie
17
       changeOrigin: true,
19
       changeOrigin: true,

+ 2
- 2
src/pages/Machinery/Machinery/index.jsx 查看文件

4
 import { PlusOutlined } from '@ant-design/icons';
4
 import { PlusOutlined } from '@ant-design/icons';
5
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
5
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
 import PageTable from '@/components/PageTable';
6
 import PageTable from '@/components/PageTable';
7
-import { getMachineryList, deleteMachinery, updateMachinery } from '@/services/machinery';
7
+import { getMachineryList, deleteMachinery, updateMachinery, updateRepair } from '@/services/machinery';
8
 import { getMachineryTypeList } from '@/services/machineryType';
8
 import { getMachineryTypeList } from '@/services/machineryType';
9
 import { getCooperativeList } from '@/services/cooperative';
9
 import { getCooperativeList } from '@/services/cooperative';
10
 
10
 
37
       okText: '确认',
37
       okText: '确认',
38
       cancelText: '取消',
38
       cancelText: '取消',
39
       onOk() {
39
       onOk() {
40
-        updateMachinery(record.machineryId, { ...record, status: record.status === 1 ? 0 : 1 })
40
+        updateRepair(record.machineryId, record.status === 1 ? 0 : 1)
41
           .then((res) => {
41
           .then((res) => {
42
             message.success('操作成功');
42
             message.success('操作成功');
43
             actionRef.current.reload();
43
             actionRef.current.reload();

+ 8
- 0
src/services/machinery.js 查看文件

14
  */
14
  */
15
 export const updateMachinery = (id, data) => request(`/machinery/${id}`, { method: 'put', data });
15
 export const updateMachinery = (id, data) => request(`/machinery/${id}`, { method: 'put', data });
16
 
16
 
17
+/**
18
+ * 维修/完成维修农机
19
+ * @param {*} data
20
+ * @returns
21
+ */
22
+export const updateRepair = (id, status) =>
23
+  request(`/machinery/${id}/status/${status}`, { method: 'put' });
24
+
17
 /**
25
 /**
18
  * 查询农机列表
26
  * 查询农机列表
19
  * @param {*} params
27
  * @param {*} params