.

config/proxy.js

@@ -1,40 +1,40 @@
-/**
- * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
- * -------------------------------
- * The agent cannot take effect in the production environment
- * so there is no configuration of the production environment
- * For details, please see
- * https://pro.ant.design/docs/deploy
- */
-export default {
-  dev: {
-    // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/api/': {
-      // 要代理的地址
-      // target: 'http://192.168.89.147:7080',
-      // target: 'http://192.168.89.25:7080',
-      target: 'http://machine.njyunzhi.com',
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个，比如 cookie
-      changeOrigin: true,
-    },
-  },
-  test: {
-    '/api/': {
-      target: 'https://proapi.azurewebsites.net',
-      changeOrigin: true,
-      pathRewrite: {
-        '^': '',
-      },
-    },
-  },
-  pre: {
-    '/api/': {
-      target: 'your pre url',
-      changeOrigin: true,
-      pathRewrite: {
-        '^': '',
-      },
-    },
-  },
-};
+/**
+ * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
+ * -------------------------------
+ * The agent cannot take effect in the production environment
+ * so there is no configuration of the production environment
+ * For details, please see
+ * https://pro.ant.design/docs/deploy
+ */
+export default {
+  dev: {
+    // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
+    '/api/': {
+      // 要代理的地址
+      // target: 'http://192.168.89.147:7080',
+      // target: 'http://192.168.89.25:7080',
+      target: 'http://machine.njyunzhi.com',
+      // 配置了这个可以从 http 代理到 https
+      // 依赖 origin 的功能可能需要这个，比如 cookie
+      changeOrigin: true,
+    },
+  },
+  test: {
+    '/api/': {
+      target: 'https://proapi.azurewebsites.net',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+  pre: {
+    '/api/': {
+      target: 'your pre url',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+};

config/routes.js

@@ -1,306 +1,306 @@
-export default [
-  {
-    path: '/user',
-    layout: false,
-    routes: [
-      {
-        path: '/user',
-        routes: [
-          {
-            name: 'login',
-            path: '/user/login',
-            component: './user/Login',
-          },
-        ],
-      },
-      {
-        component: './404',
-      },
-    ],
-  },
-  {
-    path: '/welcome',
-    name: '工作台',
-    icon: 'smile',
-    component: './Welcome',
-  },
-  {
-    path: '/MonitoringScreen',
-    layout: false,
-    name: '数据大屏',
-    icon: 'DesktopOutlined',
-    component: './MonitoringScreen',
-    access: 'screen',
-  },
-  {
-    path: '/ContentManagementSystem',
-    name: 'CMS管理',
-    icon: 'MediumOutlined',
-    component: '../layouts/BasicLayout',
-    access: 'cms',
-    routes: [
-      {
-        path: '/ContentManagementSystem/InformationClassification',
-        name: '资讯分类',
-        access: 'cmstype',
-        component: './ContentManagementSystem/InformationClassification',
-      },
-      {
-        path: '/ContentManagementSystem/InformationList',
-        name: '资讯列表',
-        access: 'news',
-        component: './ContentManagementSystem/InformationList',
-      },
-      {
-        path: '/ContentManagementSystem/InformationList/edit.jsx',
-        name: '资讯列表编辑',
-        component: './ContentManagementSystem/InformationList/edit.jsx',
-        hideInMenu: true,
-      },
-      {
-        path: '/ContentManagementSystem/Advertisement',
-        name: '广告位管理',
-        access: 'banner',
-        component: './ContentManagementSystem/Advertisement',
-      },
-      {
-        path: '/ContentManagementSystem/Advertisement/edit.jsx',
-        name: '广告位编辑',
-        component: './ContentManagementSystem/Advertisement/edit.jsx',
-        hideInMenu: true,
-      },
-    ],
-  },
-  {
-    path: '/customer',
-    name: '客户管理',
-    icon: 'IdcardOutlined',
-    access: 'customer',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/customer/index.jsx',
-        name: '客户列表',
-        access: 'customerList',
-        icon: 'smile',
-        component: './customer',
-      },
-    ],
-  },
-  {
-    path: '/Machinery',
-    name: '农机管理',
-    icon: 'CarOutlined',
-    access: 'agricultural',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/Machinery/Org',
-        name: '合作社列表',
-        access: 'org',
-        component: './Machinery/Org',
-      },
-      {
-        path: '/Machinery/Person',
-        name: '人员管理',
-        access: 'user',
-        component: './Machinery/Person',
-      },
-      {
-        path: '/Machinery/MachineryType',
-        name: '分类管理',
-        access: 'machinetype',
-        component: './Machinery/MachineryType',
-      },
-      {
-        path: '/Machinery/Machinery',
-        name: '农机列表',
-        access: 'machinery',
-        component: './Machinery/Machinery',
-      },
-      {
-        path: '/Machinery/Machinery/Edit',
-        name: '农机编辑',
-        component: './Machinery/Machinery/Edit',
-        hideInMenu: true,
-      },
-      // {
-      //   path: '/Machinery/GPS',
-      //   name: '设备管理',
-      //   access: 'device',
-      //   component: './Machinery/GPS',
-      // },
-      // {
-      //   path: '/Machinery/GPS/edit.jsx',
-      //   name: '设备编辑',
-      //   component: './Machinery/GPS/edit.jsx',
-      //   hideInMenu: true,
-      // },
-      // {
-      //   path: '/Machinery/GIS',
-      //   name: '农机GIS',
-      //   access: 'gis',
-      //   component: './Machinery/GIS',
-      // },
-    ],
-  },
-  {
-    path: '/OrderManage',
-    name: '订单调度',
-    access: 'order',
-    icon: 'PhoneOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/OrderManage/index.jsx',
-        name: '订单调度',
-        access: 'orderjob',
-        component: './OrderManage',
-      },
-      {
-        path: '/OrderManage/dispatch.jsx',
-        name: '调度详情',
-        access: 'orderjob',
-        component: './OrderManage/dispatch.jsx',
-        hideInMenu: true,
-      },
-      {
-        path: '/OrderManage/OrderList/index.jsx',
-        name: '订单列表',
-        access: 'orderList',
-        component: './OrderManage/OrderList',
-      },
-      {
-        path: '/OrderManage/JobWarning/index.jsx',
-        name: '预警监管',
-        access: 'orderwarning',
-        component: './OrderManage/JobWarning',
-      },
-      {
-        path: '/OrderManage/JobWarning/detail.jsx',
-        name: '订单详情',
-        access: 'orderwarning',
-        component: './OrderManage/JobWarning/detail.jsx',
-        hideInMenu: true,
-      },
-    ],
-  },
-  {
-    path: '/JobStatistics',
-    name: '作业统计',
-    access: 'statis',
-    icon: 'ScheduleOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/JobStatistics/Order',
-        name: '订单统计',
-        access: 'st-order',
-        component: './JobStatistics/Order',
-      },
-      {
-        path: '/JobStatistics/Job',
-        name: '作业统计',
-        access: 'st-work',
-        component: './JobStatistics/Job',
-      },
-      // {
-      //   path: '/JobStatistics/RevenueExpenditure',
-      //   name: '收支统计',
-      //   access: 'st-finance',
-      //   component: './JobStatistics/RevenueExpenditure',
-      // },
-    ],
-  },
-  {
-    path: '/Finance',
-    name: '财务管理',
-    access: 'finance',
-    icon: 'DollarOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/Finance/AccountLog',
-        name: '平台流水',
-        access: 'fi-system',
-        component: './Finance/AccountLog',
-      },
-      {
-        path: '/Finance/Withdrawal',
-        name: '提现管理',
-        access: 'fi-withdraw',
-        component: './Finance/Withdrawal',
-      },
-      {
-        path: '/Finance/Withdrawal/audit.jsx',
-        name: '提现审批',
-        component: './Finance/Withdrawal/audit.jsx',
-        hideInMenu: true,
-      },
-    ],
-  },
-  {
-    path: '/PlatformMessageManagement',
-    name: '消息管理',
-    icon: 'MailOutlined',
-    access: 'message',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/PlatformMessageManagement/MessageManageList',
-        name: '平台消息',
-        access: 'sys-message',
-        icon: 'smile',
-        component: './PlatformMessageManagement/MessageManageList',
-      },
-      {
-        path: '/PlatformMessageManagement/MessageEdit',
-        name: '消息查看',
-        component: './PlatformMessageManagement/MessageEdit',
-        hideInMenu: true,
-      },
-    ],
-  },
-  {
-    path: '/Feedback',
-    name: '意见反馈',
-    icon: 'MessageOutlined',
-    component: './Feedback',
-    access: 'feedback',
-  },
-  {
-    path: '/SystemManagement',
-    name: '系统管理',
-    icon: 'SettingOutlined',
-    access: 'system',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/SystemManagement/Region',
-        name: '区域设置',
-        access: 'region',
-        component: './SystemManagement/Region',
-      },
-      {
-        path: '/SystemManagement/UserRights',
-        name: '角色管理',
-        access: 'role',
-        component: './SystemManagement/UserRights',
-      },
-      {
-        path: '/SystemManagement/BasicParameters',
-        name: '基本参数',
-        access: 'setting',
-        component: './SystemManagement/BasicParameters',
-      },
-    ],
-  },
-
-  {
-    path: '/',
-    redirect: '/welcome',
-  },
-  {
-    component: './404',
-  },
-];
+export default [
+  {
+    path: '/user',
+    layout: false,
+    routes: [
+      {
+        path: '/user',
+        routes: [
+          {
+            name: 'login',
+            path: '/user/login',
+            component: './user/Login',
+          },
+        ],
+      },
+      {
+        component: './404',
+      },
+    ],
+  },
+  {
+    path: '/welcome',
+    name: '工作台',
+    icon: 'smile',
+    component: './Welcome',
+  },
+  {
+    path: '/MonitoringScreen',
+    layout: false,
+    name: '数据大屏',
+    icon: 'DesktopOutlined',
+    component: './MonitoringScreen',
+    access: 'screen',
+  },
+  {
+    path: '/ContentManagementSystem',
+    name: 'CMS管理',
+    icon: 'MediumOutlined',
+    component: '../layouts/BasicLayout',
+    access: 'cms',
+    routes: [
+      {
+        path: '/ContentManagementSystem/InformationClassification',
+        name: '资讯分类',
+        access: 'cmstype',
+        component: './ContentManagementSystem/InformationClassification',
+      },
+      {
+        path: '/ContentManagementSystem/InformationList',
+        name: '资讯列表',
+        access: 'news',
+        component: './ContentManagementSystem/InformationList',
+      },
+      {
+        path: '/ContentManagementSystem/InformationList/edit.jsx',
+        name: '资讯列表编辑',
+        component: './ContentManagementSystem/InformationList/edit.jsx',
+        hideInMenu: true,
+      },
+      {
+        path: '/ContentManagementSystem/Advertisement',
+        name: '广告位管理',
+        access: 'banner',
+        component: './ContentManagementSystem/Advertisement',
+      },
+      {
+        path: '/ContentManagementSystem/Advertisement/edit.jsx',
+        name: '广告位编辑',
+        component: './ContentManagementSystem/Advertisement/edit.jsx',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/customer',
+    name: '客户管理',
+    icon: 'IdcardOutlined',
+    access: 'customer',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/customer/index.jsx',
+        name: '客户列表',
+        access: 'customerList',
+        icon: 'smile',
+        component: './customer',
+      },
+    ],
+  },
+  {
+    path: '/Machinery',
+    name: '农机管理',
+    icon: 'CarOutlined',
+    access: 'agricultural',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/Machinery/Org',
+        name: '合作社列表',
+        access: 'org',
+        component: './Machinery/Org',
+      },
+      {
+        path: '/Machinery/Person',
+        name: '人员管理',
+        access: 'user',
+        component: './Machinery/Person',
+      },
+      {
+        path: '/Machinery/MachineryType',
+        name: '分类管理',
+        access: 'machinetype',
+        component: './Machinery/MachineryType',
+      },
+      {
+        path: '/Machinery/Machinery',
+        name: '农机列表',
+        access: 'machinery',
+        component: './Machinery/Machinery',
+      },
+      {
+        path: '/Machinery/Machinery/Edit',
+        name: '农机编辑',
+        component: './Machinery/Machinery/Edit',
+        hideInMenu: true,
+      },
+      // {
+      //   path: '/Machinery/GPS',
+      //   name: '设备管理',
+      //   access: 'device',
+      //   component: './Machinery/GPS',
+      // },
+      // {
+      //   path: '/Machinery/GPS/edit.jsx',
+      //   name: '设备编辑',
+      //   component: './Machinery/GPS/edit.jsx',
+      //   hideInMenu: true,
+      // },
+      // {
+      //   path: '/Machinery/GIS',
+      //   name: '农机GIS',
+      //   access: 'gis',
+      //   component: './Machinery/GIS',
+      // },
+    ],
+  },
+  {
+    path: '/OrderManage',
+    name: '订单调度',
+    access: 'order',
+    icon: 'PhoneOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/OrderManage/index.jsx',
+        name: '订单调度',
+        access: 'orderjob',
+        component: './OrderManage',
+      },
+      {
+        path: '/OrderManage/dispatch.jsx',
+        name: '调度详情',
+        access: 'orderjob',
+        component: './OrderManage/dispatch.jsx',
+        hideInMenu: true,
+      },
+      {
+        path: '/OrderManage/OrderList/index.jsx',
+        name: '订单列表',
+        access: 'orderList',
+        component: './OrderManage/OrderList',
+      },
+      {
+        path: '/OrderManage/JobWarning/index.jsx',
+        name: '预警监管',
+        access: 'orderwarning',
+        component: './OrderManage/JobWarning',
+      },
+      {
+        path: '/OrderManage/JobWarning/detail.jsx',
+        name: '订单详情',
+        access: 'orderwarning',
+        component: './OrderManage/JobWarning/detail.jsx',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/JobStatistics',
+    name: '作业统计',
+    access: 'statis',
+    icon: 'ScheduleOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/JobStatistics/Order',
+        name: '订单统计',
+        access: 'st-order',
+        component: './JobStatistics/Order',
+      },
+      {
+        path: '/JobStatistics/Job',
+        name: '作业统计',
+        access: 'st-work',
+        component: './JobStatistics/Job',
+      },
+      // {
+      //   path: '/JobStatistics/RevenueExpenditure',
+      //   name: '收支统计',
+      //   access: 'st-finance',
+      //   component: './JobStatistics/RevenueExpenditure',
+      // },
+    ],
+  },
+  {
+    path: '/Finance',
+    name: '财务管理',
+    access: 'finance',
+    icon: 'DollarOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/Finance/AccountLog',
+        name: '平台流水',
+        access: 'fi-system',
+        component: './Finance/AccountLog',
+      },
+      {
+        path: '/Finance/Withdrawal',
+        name: '提现管理',
+        access: 'fi-withdraw',
+        component: './Finance/Withdrawal',
+      },
+      {
+        path: '/Finance/Withdrawal/audit.jsx',
+        name: '提现审批',
+        component: './Finance/Withdrawal/audit.jsx',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/PlatformMessageManagement',
+    name: '消息管理',
+    icon: 'MailOutlined',
+    access: 'message',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/PlatformMessageManagement/MessageManageList',
+        name: '平台消息',
+        access: 'sys-message',
+        icon: 'smile',
+        component: './PlatformMessageManagement/MessageManageList',
+      },
+      {
+        path: '/PlatformMessageManagement/MessageEdit',
+        name: '消息查看',
+        component: './PlatformMessageManagement/MessageEdit',
+        hideInMenu: true,
+      },
+    ],
+  },
+  {
+    path: '/Feedback',
+    name: '意见反馈',
+    icon: 'MessageOutlined',
+    component: './Feedback',
+    access: 'feedback',
+  },
+  {
+    path: '/SystemManagement',
+    name: '系统管理',
+    icon: 'SettingOutlined',
+    access: 'system',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/SystemManagement/Region',
+        name: '区域设置',
+        access: 'region',
+        component: './SystemManagement/Region',
+      },
+      {
+        path: '/SystemManagement/UserRights',
+        name: '角色管理',
+        access: 'role',
+        component: './SystemManagement/UserRights',
+      },
+      {
+        path: '/SystemManagement/BasicParameters',
+        name: '基本参数',
+        access: 'setting',
+        component: './SystemManagement/BasicParameters',
+      },
+    ],
+  },
+
+  {
+    path: '/',
+    redirect: '/welcome',
+  },
+  {
+    component: './404',
+  },
+];

package.json

@@ -1,115 +1,116 @@
-{
-  "name": "ant-design-pro",
-  "version": "5.2.0",
-  "private": true,
-  "description": "An out-of-box UI solution for enterprise applications",
-  "scripts": {
-    "analyze": "cross-env ANALYZE=1 umi build",
-    "build": "umi build",
-    "deploy": "npm run build && npm run gh-pages",
-    "dev": "npm run start:dev",
-    "gh-pages": "gh-pages -d dist",
-    "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
-    "postinstall": "umi g tmp",
-    "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier && npm run tsc",
-    "lint-staged": "lint-staged",
-    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ",
-    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style",
-    "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
-    "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto",
-    "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
-    "openapi": "umi openapi",
-    "playwright": "playwright install && playwright test",
-    "prettier": "prettier -c --write \"src/**/*\"",
-    "serve": "umi-serve",
-    "start": "cross-env UMI_ENV=dev umi dev",
-    "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev umi dev",
-    "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev",
-    "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev",
-    "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev umi dev",
-    "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev umi dev",
-    "test": "umi test",
-    "test:component": "umi test ./src/components",
-    "test:e2e": "node ./tests/run-tests.js",
-    "tsc": "tsc --noEmit"
-  },
-  "lint-staged": {
-    "**/*.less": "stylelint --syntax less",
-    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "**/*.{js,jsx,tsx,ts,less,md,json}": [
-      "prettier --write"
-    ]
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ],
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-card": "^1.18.34",
-    "@ant-design/pro-descriptions": "^1.10.0",
-    "@ant-design/pro-form": "^1.52.0",
-    "@ant-design/pro-layout": "^6.32.0",
-    "@ant-design/pro-list": "^1.21.32",
-    "@ant-design/pro-table": "^2.61.0",
-    "@umijs/route-utils": "^2.0.0",
-    "ali-oss": "^6.17.1",
-    "antd": "^4.17.0",
-    "classnames": "^2.3.0",
-    "echarts": "^5.3.1",
-    "lodash": "^4.17.0",
-    "md5": "^2.3.0",
-    "moment": "^2.29.1",
-    "omit.js": "^2.0.2",
-    "rc-menu": "^9.1.0",
-    "rc-util": "^5.16.0",
-    "react": "^17.0.0",
-    "react-dev-inspector": "^1.7.0",
-    "react-dom": "^17.0.0",
-    "react-helmet-async": "^1.2.0",
-    "swiper": "^8.0.7",
-    "umi": "^3.5.0"
-  },
-  "devDependencies": {
-    "@ant-design/pro-cli": "^2.1.0",
-    "@playwright/test": "^1.17.0",
-    "@types/express": "^4.17.0",
-    "@types/history": "^4.7.0",
-    "@types/jest": "^26.0.0",
-    "@types/lodash": "^4.14.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-helmet": "^6.1.0",
-    "@umijs/fabric": "^2.8.0",
-    "@umijs/openapi": "^1.3.0",
-    "@umijs/plugin-blocks": "^2.2.0",
-    "@umijs/plugin-esbuild": "^1.4.0",
-    "@umijs/plugin-openapi": "^1.3.0",
-    "@umijs/preset-ant-design-pro": "^1.3.0",
-    "@umijs/preset-dumi": "^1.1.0",
-    "@umijs/preset-react": "^1.8.17",
-    "@umijs/yorkie": "^2.0.5",
-    "carlo": "^0.9.46",
-    "cross-env": "^7.0.0",
-    "cross-port-killer": "^1.3.0",
-    "detect-installer": "^1.0.0",
-    "enzyme": "^3.11.0",
-    "eslint": "^7.32.0",
-    "express": "^4.17.0",
-    "gh-pages": "^3.2.0",
-    "jsdom-global": "^3.0.0",
-    "lint-staged": "^10.0.0",
-    "mockjs": "^1.1.0",
-    "prettier": "^2.5.0",
-    "puppeteer-core": "^8.0.0",
-    "stylelint": "^13.0.0",
-    "swagger-ui-react": "^3.52.0",
-    "typescript": "^4.5.0",
-    "umi-serve": "^1.9.10"
-  },
-  "engines": {
-    "node": ">=10.0.0"
-  }
-}
+{
+  "name": "ant-design-pro",
+  "version": "5.2.0",
+  "private": true,
+  "description": "An out-of-box UI solution for enterprise applications",
+  "scripts": {
+    "analyze": "cross-env ANALYZE=1 umi build",
+    "build": "umi build",
+    "deploy": "npm run build && npm run gh-pages",
+    "dev": "npm run start:dev",
+    "gh-pages": "gh-pages -d dist",
+    "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
+    "postinstall": "umi g tmp",
+    "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier && npm run tsc",
+    "lint-staged": "lint-staged",
+    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ",
+    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style",
+    "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
+    "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto",
+    "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
+    "openapi": "umi openapi",
+    "playwright": "playwright install && playwright test",
+    "prettier": "prettier -c --write \"src/**/*\"",
+    "serve": "umi-serve",
+    "start": "cross-env UMI_ENV=dev umi dev",
+    "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev umi dev",
+    "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev",
+    "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev",
+    "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev umi dev",
+    "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev umi dev",
+    "test": "umi test",
+    "test:component": "umi test ./src/components",
+    "test:e2e": "node ./tests/run-tests.js",
+    "tsc": "tsc --noEmit"
+  },
+  "lint-staged": {
+    "**/*.less": "stylelint --syntax less",
+    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
+    "**/*.{js,jsx,tsx,ts,less,md,json}": [
+      "prettier --write"
+    ]
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ],
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-card": "^1.18.34",
+    "@ant-design/pro-descriptions": "^1.10.0",
+    "@ant-design/pro-form": "^1.52.0",
+    "@ant-design/pro-layout": "^6.32.0",
+    "@ant-design/pro-list": "^1.21.32",
+    "@ant-design/pro-table": "^2.61.0",
+    "@umijs/route-utils": "^2.0.0",
+    "ali-oss": "^6.17.1",
+    "antd": "^4.17.0",
+    "classnames": "^2.3.0",
+    "echarts": "^5.3.1",
+    "lodash": "^4.17.0",
+    "md5": "^2.3.0",
+    "moment": "^2.29.1",
+    "omit.js": "^2.0.2",
+    "rc-menu": "^9.1.0",
+    "rc-util": "^5.16.0",
+    "react": "^17.0.0",
+    "react-dev-inspector": "^1.7.0",
+    "react-dom": "^17.0.0",
+    "react-helmet-async": "^1.2.0",
+    "swiper": "^8.0.7",
+    "umi": "^3.5.0",
+    "web-control": "^1.0.2"
+  },
+  "devDependencies": {
+    "@ant-design/pro-cli": "^2.1.0",
+    "@playwright/test": "^1.17.0",
+    "@types/express": "^4.17.0",
+    "@types/history": "^4.7.0",
+    "@types/jest": "^26.0.0",
+    "@types/lodash": "^4.14.0",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-helmet": "^6.1.0",
+    "@umijs/fabric": "^2.8.0",
+    "@umijs/openapi": "^1.3.0",
+    "@umijs/plugin-blocks": "^2.2.0",
+    "@umijs/plugin-esbuild": "^1.4.0",
+    "@umijs/plugin-openapi": "^1.3.0",
+    "@umijs/preset-ant-design-pro": "^1.3.0",
+    "@umijs/preset-dumi": "^1.1.0",
+    "@umijs/preset-react": "^1.8.17",
+    "@umijs/yorkie": "^2.0.5",
+    "carlo": "^0.9.46",
+    "cross-env": "^7.0.0",
+    "cross-port-killer": "^1.3.0",
+    "detect-installer": "^1.0.0",
+    "enzyme": "^3.11.0",
+    "eslint": "^7.32.0",
+    "express": "^4.17.0",
+    "gh-pages": "^3.2.0",
+    "jsdom-global": "^3.0.0",
+    "lint-staged": "^10.0.0",
+    "mockjs": "^1.1.0",
+    "prettier": "^2.5.0",
+    "puppeteer-core": "^8.0.0",
+    "stylelint": "^13.0.0",
+    "swagger-ui-react": "^3.52.0",
+    "typescript": "^4.5.0",
+    "umi-serve": "^1.9.10"
+  },
+  "engines": {
+    "node": ">=10.0.0"
+  }
+}

src/components/GeoMap/global.less

@@ -1,154 +1,154 @@
-.geo-map-modal {
-  .ant-modal-header,
-  .ant-modal-content {
-    background: transparent;
-  }
-
-  .ant-modal-header {
-    color: rgba(0, 0, 0, 0);
-  }
-
-  .ant-modal-body {
-    padding: 0;
-    border: 2px solid #0bdaff;
-  }
-
-  .ant-modal-close {
-    top: 8px;
-    right: -16px;
-  }
-
-  .ant-modal-close-x {
-    color: #0bdaff;
-    font-size: 24px;
-  }
-}
-
-.geo-map-marker-label {
-  display: inline-block;
-  padding: 20px;
-  background: rgba(0, 0, 0, 0.4);
-}
-
-.geo-map-marker-label-text {
-  font-size: 24px;
-  line-height: 24px;
-  background-image: linear-gradient(180deg, #fca790 0%, #e63404 93.84765625%);
-  background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-
-// 合作社的样式----Start----
-
-.geo-map-rural-box {
-  padding: 18px;
-  font-weight: 800;
-  font-size: 12px;
-  background: rgba(3, 3, 3, 0.3);
-  border: 1px solid rgba(61, 129, 240, 0.5);
-  border-radius: 4px;
-}
-
-.borderBox {
-  background: #86fcb5;
-  background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-.geo-map-rural-text-span {
-  word-spacing: 19px;
-}
-// 合作社的样式----End----
-
-// 农机监控----Start----
-.SquareBox-box-carsMarker {
-  position: relative;
-  // height: 100%;
-  background: rgba(3, 3, 3, 0.3);
-  border: 1px solid rgba(61, 129, 240, 0.5);
-  border-radius: 4px;
-}
-.SquareBox-body-carsMarker {
-  height: 100%;
-  padding: 11px;
-  color: #fff;
-  // background: rgba(8, 40, 90, 0.4);
-  background: rgba(3, 3, 3, 0.3);
-  border: 2px solid rgba(61, 129, 240, 0.5);
-}
-.border_corner-carsMarker {
-  position: absolute;
-  width: 4px;
-  height: 4px;
-  background-color: #67ffff;
-  border-radius: 50%;
-}
-.border_corner_left_top-left {
-  top: 0;
-  left: -2px;
-  border-right: none;
-  border-bottom: none;
-}
-.border_corner_right_top-right {
-  top: 0;
-  right: -2px;
-  border-bottom: none;
-  border-left: none;
-}
-.border_corner_left_bottom-left {
-  bottom: 0;
-  left: -2px;
-  border-top: none;
-  border-right: none;
-}
-.border_corner_right_bottom-right {
-  right: -2px;
-  bottom: 0;
-  border-top: none;
-  border-left: none;
-}
-// 合作社的样式----End----
-
-// 农机监控信息----Start----
-
-//上部
-.map-top-border {
-  width: 100%;
-}
-
-.map-top-cars {
-  width: 7vw;
-}
-
-.map-top-start {
-  position: absolute;
-  top: 6.8vh;
-  left: 3.4vw;
-  // position: relative;
-  // top: 0px;
-  // left: 60px;
-}
-.map-top-stop {
-  position: absolute;
-  right: 1vw;
-  bottom: 8vh;
-}
-
-//底部
-.map-button-border {
-  font-weight: 800;
-  font-size: 12px;
-}
-.carsName {
-  margin-top: 15px;
-  background: #86fcb5;
-  background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-.map-button-border-carsRural {
-  display: flex;
-  justify-content: space-between;
-  > span {
-    font-weight: 800;
-  }
-}
-// 合作社的样式----End----
+.geo-map-modal {
+  .ant-modal-header,
+  .ant-modal-content {
+    background: transparent;
+  }
+
+  .ant-modal-header {
+    color: rgba(0, 0, 0, 0);
+  }
+
+  .ant-modal-body {
+    padding: 0;
+    border: 2px solid #0bdaff;
+  }
+
+  .ant-modal-close {
+    top: 8px;
+    right: -16px;
+  }
+
+  .ant-modal-close-x {
+    color: #0bdaff;
+    font-size: 24px;
+  }
+}
+
+.geo-map-marker-label {
+  display: inline-block;
+  padding: 20px;
+  background: rgba(0, 0, 0, 0.4);
+}
+
+.geo-map-marker-label-text {
+  font-size: 24px;
+  line-height: 24px;
+  background-image: linear-gradient(180deg, #fca790 0%, #e63404 93.84765625%);
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+// 合作社的样式----Start----
+
+.geo-map-rural-box {
+  padding: 18px;
+  font-weight: 800;
+  font-size: 12px;
+  background: rgba(3, 3, 3, 0.3);
+  border: 1px solid rgba(61, 129, 240, 0.5);
+  border-radius: 4px;
+}
+
+.borderBox {
+  background: #86fcb5;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+.geo-map-rural-text-span {
+  word-spacing: 19px;
+}
+// 合作社的样式----End----
+
+// 农机监控----Start----
+.SquareBox-box-carsMarker {
+  position: relative;
+  // height: 100%;
+  background: rgba(3, 3, 3, 0.3);
+  border: 1px solid rgba(61, 129, 240, 0.5);
+  border-radius: 4px;
+}
+.SquareBox-body-carsMarker {
+  height: 100%;
+  padding: 11px;
+  color: #fff;
+  // background: rgba(8, 40, 90, 0.4);
+  background: rgba(3, 3, 3, 0.3);
+  border: 2px solid rgba(61, 129, 240, 0.5);
+}
+.border_corner-carsMarker {
+  position: absolute;
+  width: 4px;
+  height: 4px;
+  background-color: #67ffff;
+  border-radius: 50%;
+}
+.border_corner_left_top-left {
+  top: 0;
+  left: -2px;
+  border-right: none;
+  border-bottom: none;
+}
+.border_corner_right_top-right {
+  top: 0;
+  right: -2px;
+  border-bottom: none;
+  border-left: none;
+}
+.border_corner_left_bottom-left {
+  bottom: 0;
+  left: -2px;
+  border-top: none;
+  border-right: none;
+}
+.border_corner_right_bottom-right {
+  right: -2px;
+  bottom: 0;
+  border-top: none;
+  border-left: none;
+}
+// 合作社的样式----End----
+
+// 农机监控信息----Start----
+
+//上部
+.map-top-border {
+  width: 100%;
+}
+
+.map-top-cars {
+  width: 7vw;
+}
+
+.map-top-start {
+  position: absolute;
+  top: 6.8vh;
+  left: 3.4vw;
+  // position: relative;
+  // top: 0px;
+  // left: 60px;
+}
+.map-top-stop {
+  position: absolute;
+  right: 1vw;
+  bottom: 8vh;
+}
+
+//底部
+.map-button-border {
+  font-weight: 800;
+  font-size: 12px;
+}
+.carsName {
+  margin-top: 15px;
+  background: #86fcb5;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+.map-button-border-carsRural {
+  display: flex;
+  justify-content: space-between;
+  > span {
+    font-weight: 800;
+  }
+}
+// 合作社的样式----End----

src/components/Hatc/sdk.js

@@ -1,111 +1,110 @@
-/**
- * https://yz-websit.oss-cn-hangzhou.aliyuncs.com/nanyang/%E8%B7%A8%E6%B5%8F%E8%A7%88%E5%99%A8%E5%AA%92%E4%BD%93%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.pdf
- * SDK 使用大致说明
- * 1、npm i web-control
- * 2、使用 new WebControl 实例化插件
- * 3、使用 JS_StartService 开启服务
- * 4、使用 JS_SetWindowControlCallback 注册回调
- * 5、使用 JS_CreateWnd 创建窗口
- * 6、使用 JS_DestroyWnd 销毁窗口
- * 7、使用 JS_Disconnect 断开连接
- */
-
-/**
- * SDK
- */
-export default function SDK({ id, width, height }) {
-  return new Promise((resolve, reject) => {
-    const ctx = {};
-    const ctrl = new WebControl({
-      szPluginContainer: id,
-      iServicePortStart: 14430, // 固定值
-      iServicePortEnd: 14439, // 固定值
-      szClassId: '29DDBC9A-8AEA-4827-9C3A-805D697CF38F', // 固定值
-      cbConnectSuccess: function () {
-        console.log('cbConnectSuccess');
-
-        // ctrl.SetWindowControlCallback({
-        //   cbIntegrationCallBack: callback,
-        // });
-
-        ctrl
-          .JS_StartService('window', {
-            dllPath: './WebPreview.dll',
-          })
-          .then(() => {
-            resolve(ctx);
-          })
-          .catch((err) => {
-            console.error(err);
-            reject(err);
-          });
-      },
-      cbConnectError: function () {
-        console.log('cbConnectError');
-        reject(new Error('cbConnectError'));
-      },
-      cbConnectClose: function (bNormalClose) {
-        console.log('cbConnectClose');
-      },
-    });
-    ctx.ctrl = ctrl;
-
-    // 实时预览
-    function preview(params) {
-      console.log('------preview-------', params);
-      return ctrl.JS_CreateWnd(id, width, height).then(function (resp) {
-        console.log('------JS_CreateWnd-------', resp);
-        return ctrl
-          .JS_RequestInterface({
-            funcName: 'setPreviewLayout',
-            arguments: {
-              devSerialNum: params.devSerialNum,
-              productKey: params.productKey,
-              layout: 1,
-              channels: [{ channel: params.channel, channelName: '前视' }],
-              channelName: '前视',
-              channel: params.channel,
-            },
-          })
-          .then(function (oData) {
-            console.log('------setPreviewLayout-------', oData);
-            return ctrl
-              .JS_RequestInterface({
-                funcName: 'startPreview',
-                arguments: {
-                  url: params.url,
-                  devSerialNum: params.devSerialNum,
-                  productKey: params.productKey,
-                  channel: params.channel,
-                  streamType: params.streamType,
-                  code: params.code,
-                  protocol: params.protocol,
-                },
-              })
-              .then((res) => {
-                console.log('------startPreview-------', res);
-              });
-          });
-      });
-    }
-    ctx.preview = preview;
-
-    // 停止播放
-    function stopPreview() {
-      ctrl.JS_RequestInterface({
-        funcName: 'stopAllPreview',
-        arguments: {},
-      });
-      ctrl.JS_DestroyWnd();
-    }
-    ctx.stopPreview = stopPreview;
-
-    // 销毁
-    function destroy() {
-      // 关闭所有预览
-      stopPreview();
-      ctrl.JS_Disconnect();
-    }
-    ctx.destroy = destroy;
-  });
-}
+/**
+ * https://yz-websit.oss-cn-hangzhou.aliyuncs.com/nanyang/%E8%B7%A8%E6%B5%8F%E8%A7%88%E5%99%A8%E5%AA%92%E4%BD%93%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.pdf
+ * SDK 使用大致说明
+ * 1、npm i web-control
+ * 2、使用 new WebControl 实例化插件
+ * 3、使用 JS_StartService 开启服务
+ * 4、使用 JS_SetWindowControlCallback 注册回调
+ * 5、使用 JS_CreateWnd 创建窗口
+ * 6、使用 JS_DestroyWnd 销毁窗口
+ * 7、使用 JS_Disconnect 断开连接
+ */
+
+/**
+ * SDK
+ */
+export default function SDK ({ id, width, height }) {
+  return new Promise((resolve, reject) => {
+    const ctx = {};
+    const ctrl = new WebControl({
+      szPluginContainer: id,
+      iServicePortStart: 14430, // 固定值
+      iServicePortEnd: 14439, // 固定值
+      szClassId: '29DDBC9A-8AEA-4827-9C3A-805D697CF38F', // 固定值
+      cbConnectSuccess: function () {
+        console.log('cbConnectSuccess');
+
+        // ctrl.SetWindowControlCallback({
+        //   cbIntegrationCallBack: callback,
+        // });
+        ctrl
+          .JS_StartService('window', {
+            dllPath: './WebPreview.dll',
+          })
+          .then(() => {
+            resolve(ctx);
+          })
+          .catch((err) => {
+            console.error(err);
+            reject(err);
+          });
+      },
+      cbConnectError: function () {
+        console.log('cbConnectError');
+        reject(new Error('cbConnectError'));
+      },
+      cbConnectClose: function (bNormalClose) {
+        console.log('cbConnectClose');
+      },
+    });
+    ctx.ctrl = ctrl;
+
+    // 实时预览
+    function preview (params) {
+      console.log('------preview-------', params);
+      return ctrl.JS_CreateWnd(id, width, height).then(function (resp) {
+        console.log('------JS_CreateWnd-------', resp);
+        return ctrl
+          .JS_RequestInterface({
+            funcName: 'setPreviewLayout',
+            arguments: {
+              devSerialNum: params.devSerialNum,
+              productKey: params.productKey,
+              layout: 1,
+              channels: [{ channel: params.channel, channelName: '前视' }],
+              channelName: '前视',
+              channel: params.channel,
+            },
+          })
+          .then(function (oData) {
+            console.log('------setPreviewLayout-------', oData);
+            return ctrl
+              .JS_RequestInterface({
+                funcName: 'startPreview',
+                arguments: {
+                  url: params.url,
+                  devSerialNum: params.devSerialNum,
+                  productKey: params.productKey,
+                  channel: params.channel,
+                  streamType: params.streamType,
+                  code: params.code,
+                  protocol: params.protocol,
+                },
+              })
+              .then((res) => {
+                console.log('------startPreview-------', res);
+              });
+          });
+      });
+    }
+    ctx.preview = preview;
+
+    // 停止播放
+    function stopPreview () {
+      ctrl.JS_RequestInterface({
+        funcName: 'stopAllPreview',
+        arguments: {},
+      });
+      ctrl.JS_DestroyWnd();
+    }
+    ctx.stopPreview = stopPreview;
+
+    // 销毁
+    function destroy () {
+      // 关闭所有预览
+      stopPreview();
+      ctrl.JS_Disconnect();
+    }
+    ctx.destroy = destroy;
+  });
+}

src/pages/Machinery/Machinery/index.jsx

@@ -1,203 +1,203 @@
-import React, { useRef, useEffect, useState } from 'react';
-import { history } from 'umi';
-import { Button, Popconfirm, message, Select, Modal } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import PageTable from '@/components/PageTable';
-import { getMachineryList, deleteMachinery, updateMachinery, updateRepair } from '@/services/machinery';
-import { getMachineryTypeList } from '@/services/machineryType';
-import { getCooperativeList } from '@/services/cooperative';
-
-const { Option } = Select;
-
-export default (props) => {
-  const actionRef = useRef();
-  const [machineryTypeList, setMachineryTypeList] = useState([]);
-  const [cooperativeList, setCooperativeList] = useState([]);
-
-  const gotoEdit = (id) => {
-    const queryStr = id ? `?id=${id}` : '';
-    history.push(`./machinery/Edit${queryStr}`);
-  };
-  const handleDelete = (id) => {
-    deleteMachinery(id).then(() => {
-      message.success('删除成功');
-      actionRef.current.reload();
-    }).catch((err) => {
-      console.log(err.message)
-    });
-  };
-  //列表切换农机状态方法
-  const handleOK = (record, data) => {
-    const title = record.status
-      ? '您确定要将该农机状态变更为维修中吗? 变更后后该农机将不能调度'
-      : '您确定要将该农机状态变更为正常吗? 变更后该农机可以调度';
-    Modal.confirm({
-      title: title,
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        updateRepair(record.machineryId, record.status === 1 ? 0 : 1)
-          .then((res) => {
-            message.success('操作成功');
-            actionRef.current.reload();
-          })
-          .catch((err) => {
-            console.log(err.message)
-          });
-      },
-    });
-  };
-  useEffect(() => {
-    getCooperativeList({ pageSize: 999 }).then((res) => {
-      setCooperativeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-    getMachineryTypeList({ pageSize: 999 }).then((res) => {
-      setMachineryTypeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-  }, []);
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
-      新增农机
-    </Button>,
-  ];
-  const columns = [
-    {
-      title: '合作社',
-      dataIndex: 'orgId',
-      key: 'orgId',
-      hideInTable: true,
-      renderFormItem: (item, field, form) => {
-        return (
-          <Select>
-            {cooperativeList.map((item) => (
-              <Option value={item.orgId} key={item.orgId}>
-                {item.name}
-              </Option>
-            ))}
-          </Select>
-        )
-      }
-    },
-    {
-      title: '名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '合作社',
-      dataIndex: 'orgName',
-      key: 'orgName',
-      search: false
-    },
-    {
-      title: '农机类型',
-      dataIndex: 'typeId',
-      key: 'typeId',
-      renderFormItem: (item, field, form) => {
-        return (
-          <Select>
-            {machineryTypeList.map((item) => (
-              <Option value={item.typeId} key={item.typeId}>
-                {item.name}
-              </Option>
-            ))}
-          </Select>
-        );
-      },
-      hideInTable: true,
-    },
-    {
-      title: '农机类型',
-      dataIndex: 'typeName',
-      key: 'typeName',
-      search: false,
-    },
-    {
-      title: '区域',
-      dataIndex: 'regionName',
-      key: 'regionName',
-      search: false,
-    },
-    {
-      title: '农机单价',
-      dataIndex: 'price',
-      key: 'price',
-      render: (t) => t / 100,
-      search: false,
-    },
-    {
-      title: '主图',
-      dataIndex: 'thumb',
-      key: 'thumb',
-      width: 150,
-      render: (t) => <img width={110} src={t} alt="" />,
-      search: false,
-    },
-    {
-      title: '工作状态',
-      dataIndex: 'jobStatus',
-      key: 'jobStatus',
-      search: false,
-      render: (_, record) => {
-        return record.jobStatus == 1 ? '使用中' : '空闲中';
-      },
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      search: false,
-      render: (_, record) => {
-        return record.status === 1 ? '正常' : '维修中';
-      },
-    },
-    {
-      title: '操作',
-      valueType: 'option',
-      render: (_, record) => [
-        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
-          {record.status === 0 ? '完成维修' : '维修'}
-        </Button>,
-        <Button
-          style={{ padding: 0 }}
-          type="link"
-          key={2}
-          onClick={() => gotoEdit(record.machineryId)}
-        >
-          编辑
-        </Button>,
-        <Popconfirm
-          key={3}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.machineryId)}
-          okText="确定"
-          cancelText="取消"
-        >
-          <Button style={{ padding: 0 }} type="link">
-            删除
-          </Button>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  return (
-    <PageHeaderWrapper>
-      <PageTable
-        request={getMachineryList}
-        // expfunc={exportPersonList}
-        toolBarRender={actions}
-        actionRef={actionRef}
-        columns={columns}
-        rowKey="machineryId"
-        options={false}
-        scroll={{ x: 1000 }}
-      />
-    </PageHeaderWrapper>
-  );
-};
+import React, { useRef, useEffect, useState } from 'react';
+import { history } from 'umi';
+import { Button, Popconfirm, message, Select, Modal } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import PageTable from '@/components/PageTable';
+import { getMachineryList, deleteMachinery, updateMachinery, updateRepair } from '@/services/machinery';
+import { getMachineryTypeList } from '@/services/machineryType';
+import { getCooperativeList } from '@/services/cooperative';
+
+const { Option } = Select;
+
+export default (props) => {
+  const actionRef = useRef();
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [cooperativeList, setCooperativeList] = useState([]);
+
+  const gotoEdit = (id) => {
+    const queryStr = id ? `?id=${id}` : '';
+    history.push(`./machinery/Edit${queryStr}`);
+  };
+  const handleDelete = (id) => {
+    deleteMachinery(id).then(() => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  };
+  //列表切换农机状态方法
+  const handleOK = (record, data) => {
+    const title = record.status
+      ? '您确定要将该农机状态变更为维修中吗? 变更后后该农机将不能调度'
+      : '您确定要将该农机状态变更为正常吗? 变更后该农机可以调度';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        updateRepair(record.machineryId, record.status === 1 ? 0 : 1)
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            console.log(err.message)
+          });
+      },
+    });
+  };
+  useEffect(() => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
+      setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
+      setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, []);
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
+      新增农机
+    </Button>,
+  ];
+  const columns = [
+    {
+      title: '合作社',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
+      }
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '合作社',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false
+    },
+    {
+      title: '农机类型',
+      dataIndex: 'typeId',
+      key: 'typeId',
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            {machineryTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        );
+      },
+      hideInTable: true,
+    },
+    {
+      title: '农机类型',
+      dataIndex: 'typeName',
+      key: 'typeName',
+      search: false,
+    },
+    {
+      title: '区域',
+      dataIndex: 'regionName',
+      key: 'regionName',
+      search: false,
+    },
+    {
+      title: '农机单价',
+      dataIndex: 'price',
+      key: 'price',
+      render: (t) => t / 100,
+      search: false,
+    },
+    {
+      title: '主图',
+      dataIndex: 'thumb',
+      key: 'thumb',
+      width: 150,
+      render: (t) => <img width={110} src={t} alt="" />,
+      search: false,
+    },
+    {
+      title: '工作状态',
+      dataIndex: 'jobStatus',
+      key: 'jobStatus',
+      search: false,
+      render: (_, record) => {
+        return record.jobStatus == 1 ? '使用中' : '空闲中';
+      },
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      search: false,
+      render: (_, record) => {
+        return record.status === 1 ? '正常' : '维修中';
+      },
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '完成维修' : '维修'}
+        </Button>,
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={2}
+          onClick={() => gotoEdit(record.machineryId)}
+        >
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.machineryId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getMachineryList}
+        // expfunc={exportPersonList}
+        toolBarRender={actions}
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="machineryId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/services/machinery.js

@@ -1,58 +1,58 @@
-import request from '@/utils/request';
-
-/**
- * 保存农机
- * @param {*} data
- * @returns
- */
-export const addMachinery = (data) => request('/machinery', { method: 'post', data });
-
-/**
- * 修改农机
- * @param {*} data
- * @returns
- */
-export const updateMachinery = (id, data) => request(`/machinery/${id}`, { method: 'put', data });
-
-/**
- * 维修/完成维修农机
- * @param {*} data
- * @returns
- */
-export const updateRepair = (id, status) =>
-  request(`/machinery/${id}/status/${status}`, { method: 'put' });
-
-/**
- * 查询农机列表
- * @param {*} params
- * @returns
- */
-export const getMachineryList = (params) => request('/machinery', { params });
-
-/**
- * 删除农机
- * @param {*} data
- * @returns
- */
-export const deleteMachinery = (id) => request(`/machinery/${id}`, { method: 'delete' });
-
-/**
- * 查询农机详情
- * @param {*} params
- * @returns
- */
-export const getMachineryDetail = (id) => request(`/machinery/${id}`);
-
-/**
- * 查询预约状态
- * @param {*} params
- * @returns
- */
-export const getduty = (id, params) => request(`/machinery/${id}/duty`, { params });
-
-/**
- * 查询实时预览信息
- * @param {*} id
- * @returns
- */
-export const getPreviewInfo = (id) => request(`/machinery/${id}/preview`);
+import request from '@/utils/request';
+
+/**
+ * 保存农机
+ * @param {*} data
+ * @returns
+ */
+export const addMachinery = (data) => request('/machinery', { method: 'post', data });
+
+/**
+ * 修改农机
+ * @param {*} data
+ * @returns
+ */
+export const updateMachinery = (id, data) => request(`/machinery/${id}`, { method: 'put', data });
+
+/**
+ * 维修/完成维修农机
+ * @param {*} data
+ * @returns
+ */
+export const updateRepair = (id, status) =>
+  request(`/machinery/${id}/status/${status}`, { method: 'put' });
+
+/**
+ * 查询农机列表
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryList = (params) => request('/machinery', { params });
+
+/**
+ * 删除农机
+ * @param {*} data
+ * @returns
+ */
+export const deleteMachinery = (id) => request(`/machinery/${id}`, { method: 'delete' });
+
+/**
+ * 查询农机详情
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryDetail = (id) => request(`/machinery/${id}`);
+
+/**
+ * 查询预约状态
+ * @param {*} params
+ * @returns
+ */
+export const getduty = (id, params) => request(`/machinery/${id}/duty`, { params });
+
+/**
+ * 查询实时预览信息
+ * @param {*} id
+ * @returns
+ */
+export const getPreviewInfo = (id) => request(`/machinery/${id}/preview`);