feats

config/defaultSettings.js

@@ -7,7 +7,7 @@ const Settings = {
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
-  title: '南阳智慧农机系统',
+  title: '邓州市源盛农机数据可视化平台',
   pwa: false,
   menu: {
     locale: false,

config/proxy.js

@@ -11,9 +11,9 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      // target: 'http://192.168.89.147:7080',
+      target: 'http://127.0.0.1:7080',
       // target: 'http://192.168.89.25:7080',
-      target: 'http://machine.njyunzhi.com',
+      // target: 'http://machine.njyunzhi.com',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,

src/components/ScreenBox/ScreenHeader/style.less

@@ -42,7 +42,8 @@
     justify-content: center;
 
     & > img {
-      height: 50%;
+      width: 48%;
+      height: 48%;
     }
   }
 

src/pages/MonitoringScreen/index.jsx

@@ -1,18 +1,17 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { history, Link } from 'umi';
-import classNames from 'classnames';
-import ScreenHeader from '@/components/ScreenBox/ScreenHeader';
+import getWeather from '@/components/AMap/weather';
 import GeoMap from '@/components/GeoMap';
-import StatisCard from '@/components/ScreenBox/StatisCard';
+import ScreenHeader from '@/components/ScreenBox/ScreenHeader';
 import SquareBox from '@/components/ScreenBox/SquareBox';
-import getWeather from '@/components/AMap/weather';
-import { useParticlesJs } from './hook';
-import MachineryType from './components/MachineryType';
+import StatisCard from '@/components/ScreenBox/StatisCard';
+import classNames from 'classnames';
+import { useEffect, useRef, useState } from 'react';
 import MachineryStatus from './components/MachineryStatus';
+import MachineryType from './components/MachineryType';
+import { useParticlesJs } from './hook';
 
-import WorkArea from './components/WorkArea';
-import List from './components/List';
 import ColorFont from './components/ColorFont';
+import List from './components/List';
+import WorkArea from './components/WorkArea';
 import WorkData from './components/WorkData';
 import Styles from './style.less';
 
@@ -197,12 +196,11 @@ export default (props) => {
                   </div>
                   <div>
                     <ColorFont color="#F5CC5C">[幸福人生]</ColorFont> 58分钟前预约了一台收割机，
-                    <ColorFont color="#44F68B">[播种机008]</ColorFont> 接到了此订单！尽快赶到！
+                    <ColorFont color="#44F68B">[播种机008]</ColorFont> 接到了此订单！
                   </div>
                   <div>
                     <ColorFont color="#F5CC5C">[灿烂人生]</ColorFont> 2个小时前预约了一台收割机，
-                    <ColorFont color="#44F68B">[收割机007]</ColorFont>{' '}
-                    接到了此订单！正在赶往目的地！
+                    <ColorFont color="#44F68B">[收割机007]</ColorFont> 接到了此订单！
                   </div>
                   <div>
                     <ColorFont color="#F5CC5C">[快乐每一天]</ColorFont> 32s前预约了一台收割机，
@@ -210,12 +208,11 @@ export default (props) => {
                   </div>
                   <div>
                     <ColorFont color="#F5CC5C">[幸福人生]</ColorFont> 58分钟前预约了一台收割机，
-                    <ColorFont color="#44F68B">[播种机008]</ColorFont> 接到了此订单！尽快赶到！
+                    <ColorFont color="#44F68B">[播种机008]</ColorFont> 接到了此订单！
                   </div>
                   <div>
                     <ColorFont color="#F5CC5C">[灿烂人生]</ColorFont> 2个小时前预约了一台收割机，
-                    <ColorFont color="#44F68B">[收割机007]</ColorFont>{' '}
-                    接到了此订单！正在赶往目的地！
+                    <ColorFont color="#44F68B">[收割机007]</ColorFont> 接到了此订单！
                   </div>
                 </List>
               </div>
@@ -224,15 +221,15 @@ export default (props) => {
                 <List title="作业订单" color="green">
                   <div>
                     <ColorFont color="#44F68B">[收割机001]</ColorFont>
-                    32s前接到了一个订单，距离目的地还有3.2公里，请农户耐心等待！
+                    32s前接到了一个订单，距离目的地还有3.2公里。
                   </div>
                   <div>
                     <ColorFont color="#44F68B">[播种机008]</ColorFont>{' '}
-                    2分钟前接到一个订单，距离目的地还有3.8公里，请农户耐心等待！
+                    2分钟前接到一个订单，距离目的地还有3.8公里。
                   </div>
                   <div>
                     <ColorFont color="#44F68B">[收割机007]</ColorFont>{' '}
-                    2个小时前接到一个订单，距离目的地还有3.8公里，请农户耐心等待！
+                    2个小时前接到一个订单，距离目的地还有3.8公里。
                   </div>
                 </List>
               </div>

src/pages/document.ejs

@@ -22,7 +22,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
-    <title>Ant Design Pro</title>
+    <title>邓州农机数据可视化平台</title>
     <link rel="icon" href="<%= context.config.publicPath +'favicon.ico'%>" type="image/x-icon" />
     <script src="./js/particles.min.js"></script>
     <script src="./js/jsWebControl-1.0.0.min.js"></script>