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 {

src/pages/MonitoringScreen/DateCommponetsBottomLeft.jsx

@@ -1,76 +0,0 @@
-import SquareBox from '@/components/ScreenBox/SquareBox';
-import TitleBox from '@/components/ScreenBox/TitleBox';
-import { Column } from '@ant-design/plots';
-// import ba from './a.png'
-
-export default (props) => {
-  const data = [
-    {
-      name: '预约',
-      NongType: '预约.',
-      sum: 18,
-    },
-    {
-      name: '作业',
-      NongType: '作业.',
-      sum: 28,
-    },
-    {
-      name: '闲置',
-      NongType: '闲置.',
-      sum: 100,
-    },
-    {
-      name: '离线',
-      NongType: '离线',
-      sum: 181,
-    },
-    {
-      name: '维修',
-      NongType: '维修',
-      sum: 147,
-    },
-  ];
-  const config = {
-    data,
-    isGroup: true,
-    xField: 'NongType',
-    yField: 'sum',
-    seriesField: 'name',
-    color: [
-      'l(270) 0:rgba(225,225,225,0.0) 1:#F5CC5C',
-      'l(270) 0:rgba(225,225,225,0.0) 1:#44F68B',
-      'l(270) 0:rgba(225,225,225,0.0) 1:#51D4FF',
-      'l(270) 0:rgba(225,225,225,0.0) 1:#B8B2A9',
-      'l(270) 0:rgba(225,225,225,0.0) 1:#F55226',
-    ],
-
-    /** 设置间距 */
-    // marginRatio: 0.1,
-    label: {
-      // 'top', 'middle', 'bottom'
-      // 可配置附加的布局方法
-      layout: [
-        // 柱形图数据标签位置自动调整
-        {
-          // type: 'interval-adjust-position',
-        }, // 数据标签防遮挡
-        {
-          // type: 'interval-hide-overlap',
-        }, // 数据标签文颜色自动调整
-        {
-          // type: 'adjust-color',
-        },
-      ],
-    },
-  };
-
-  return (
-    <div>
-      <TitleBox value="农机状态统计" />
-      <SquareBox>
-        <Column {...config} />
-      </SquareBox>
-    </div>
-  );
-};

src/pages/MonitoringScreen/DateCommponetsBottomRight.jsx

@@ -1,83 +0,0 @@
-import SquareBox from '@/components/ScreenBox/SquareBox';
-import TitleBox from '@/components/ScreenBox/TitleBox';
-import { Pie, G2 } from '@ant-design/plots';
-// import ba from './a.png'
-import RedRing from '@/assets/images/screen/ring-red.png';
-
-export default (props) => {
-  const data = [
-    {
-      type: '收割机',
-      value: 27,
-    },
-    {
-      type: '播种机',
-      value: 25,
-    },
-    {
-      type: '农药机',
-      value: 18,
-    },
-    {
-      type: '其他',
-      value: 70,
-    },
-  ];
-
-  const config = {
-    // color: [
-    //   'r(0.5, 0.5, 1) 0:rgba(225,225,225,0.0) 0.25:#FB9900 0.5:rgba(225,225,225,0.0)  0.75:1:#FB9900 1:#FB9900',
-    //   'r(0.5, 0.5, 1) 0:rgba(225,225,225,0.0) 1:#23E8AE',
-    //   'r(0.5, 0.5, 1) 0:rgba(225,225,225,0.0) 1:#E63404',
-    // ],
-    // pieStyle: {
-    //   strokeOpacity: 0,
-    //   lineWidth: 0,
-    // },
-    pieStyle: () => {
-      return {
-        fill: `p(n)${RedRing}`,
-      };
-    },
-    statistic: {
-      title: false,
-      content: {
-        style: {
-          whiteSpace: 'pre-wrap',
-          overflow: 'hidden',
-          textOverflow: 'ellipsis',
-        },
-        content: ' ',
-      },
-    },
-    appendPadding: 10,
-    data,
-    angleField: 'value',
-    colorField: 'type',
-    innerRadius: 0.8,
-    radius: 0.75,
-    label: {
-      type: 'spider',
-      labelHeight: 28,
-      content: '{name}\n{percentage}',
-      fill: 'rgba(225, 0, 0, 0.65)',
-    },
-
-    interactions: [
-      {
-        type: 'element-selected',
-      },
-      {
-        type: 'element-active',
-      },
-    ],
-  };
-  return (
-    <div>
-      <TitleBox value="农机类型统计" />
-      <SquareBox>
-        <Pie {...config} />
-      </SquareBox>
-    </div>
-  );
-};

src/pages/MonitoringScreen/DateCommponetsLeft.jsx

@@ -1,69 +0,0 @@
-import SquareBox from '@/components/ScreenBox/SquareBox';
-import TitleBox from '@/components/ScreenBox/TitleBox';
-import { Bar } from '@ant-design/plots';
-
-export default (props) => {
-  const data = [
-    {
-      key: '收割机',
-      value: 300,
-    },
-    {
-      key: '播种机',
-      value: 150,
-    },
-    {
-      key: '农药机',
-      value: 50,
-    },
-  ];
-
-  const config = {
-    data,
-    axis: {
-      tickLine: null,
-      subTickLine: null,
-      grid: null,
-      line: null,
-    },
-    xField: 'value',
-    yField: 'key',
-    seriesField: 'key',
-    color: [
-      'l(0) 0:rgba(225,225,225,0.0) 1:#FB9900',
-      'l(0) 0:rgba(225,225,225,0.0) 1:#23E8AE',
-      'l(0) 0:rgba(225,225,225,0.0) 1:#E63404',
-    ],
-    legend: {
-      position: 'top-left',
-    },
-    barBackground: {
-      style: {
-        fill: 'rgba(0,0,0,0.1)',
-      },
-    },
-    interactions: [
-      {
-        type: 'active-region',
-        enable: false,
-      },
-    ],
-    statistic: {
-      style: {
-        fontSize: 10,
-        fontWeight: 60,
-        textAlign: 'center',
-        textBaseline: 'middle',
-      },
-    },
-  };
-
-  return (
-    <div>
-      <TitleBox value="农机类型统计" />
-      <SquareBox>
-        <Bar {...config} />
-      </SquareBox>
-    </div>
-  );
-};