feats

config/proxy.js

@@ -11,7 +11,7 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.76:7080',
+      target: 'http://192.168.89.147:7080',
       // target: 'http://192.168.89.76:7080',
       // target: 'http://machine.njyunzhi.com',
       // 配置了这个可以从 http 代理到 https

src/pages/MonitoringScreen2/components/MachineryInfo.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Col, Row } from 'antd';
 
 export default React.forwardRef((props, ref) => {
-  const { data = {} } = props;
+  const { data = {}, onClose } = props;
   console.log(data);
 
   return (
@@ -12,11 +12,14 @@ export default React.forwardRef((props, ref) => {
         background: 'rgba(0,0,0,0.8)',
         color: '#fff',
         padding: '1em',
+        paddingTop: '0',
         borderRadius: '4px',
         width: '320px',
       }}
     >
-      <div style={{ textAlign: 'right' }}>X</div>
+      <div style={{ textAlign: 'right', fontSize: '24px' }} onClick={onClose}>
+        ×
+      </div>
       <Row gutter={16}>
         <Col span={8}>农机名称</Col>
         <Col span={16}>{data.machineryName || ''}</Col>

src/pages/MonitoringScreen2/index.jsx

@@ -158,7 +158,13 @@ export default (props) => {
         </div>
       </div>
       <div style={{ position: 'absolute', zIndex: -1 }}>
-        <MachineryInfo data={curMachine} ref={infoWinRef} />
+        <MachineryInfo
+          data={curMachine}
+          ref={infoWinRef}
+          onClose={() => {
+            mapRef.current.clearInfoWindow();
+          }}
+        />
       </div>
     </div>
   );