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

src/pages/Machinery/Machinery/edit.jsx

@@ -58,15 +58,6 @@ export default (props) => {
     }
   };
 
-  const selectTagList = (params) => {
-    // return getTagList({
-    // }).then((res) => {
-    // }).catch((err) => {
-    //   return {
-    //     success: false,
-    //   }
-    // })
-  };
   const onDateChange = () => {};
   const imageInput = (image) => {
     return {

src/pages/Machinery/Machinery/index.jsx

@@ -1,15 +1,11 @@
 import React, { useRef } from 'react';
-import { history, Link } from 'umi';
+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 moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getMachineryList, deleteMachinery, updateMachinery } from '@/services/machinery';
 
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
 const { Option } = Select;
 
 export default (props) => {

src/pages/Machinery/MachineryType/index.jsx

@@ -1,7 +1,7 @@
 import { Button, Popconfirm, Modal, Form, Input, message, Select } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import React, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState } from 'react';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import {