Merge branch 'master' of http://120.55.44.4:10080/xujunjie/BigScreen

# Conflicts:
#	src/components/WaterSupply/EnergyConsumption.js
#	src/components/WaterSupply/WaterVolume.js

src/components/Map/Project.js

@@ -115,12 +115,13 @@ class Project extends PureComponent {
     });
   }
   toggleInfo() {
+    if (!this.props.data) return;
     this.setState({
       visible: !this.state.visible,
     });
   }
   render() {
-    const { position, icon, title, showLushu = false } = this.props;
+    const { position, icon, title, showLushu = false, data } = this.props;
     const { start, visible, flash } = this.state;
     if (start) return null;
     return (
@@ -136,7 +137,8 @@ class Project extends PureComponent {
           <InfoBox
             showLushu={showLushu}
             onClick={() => this.startLushu()}
-            dataPump={dataPump}
+            title={title}
+            dataPump={data}
           />
         )}
       </CustomOverlay>

src/components/Map/components/Modal.js

@@ -7,18 +7,18 @@ export const ItemType = {
 };
 
 const InfoBox = (props) => {
-  const { dataPump, showLushu, onClick } = props;
+  const { dataPump, title, showLushu, onClick } = props;
   return (
     <Main>
       <div className="top">
-        {dataPump.name}
+        {title}
         <span>
           2023-03-15
           <br />
           12:00:00
         </span>
       </div>
-      {dataPump.data.map((item) => {
+      {dataPump?.map((item) => {
         if (item.type && item.type == ItemType.pump) {
           return (
             <div className="item">

src/components/Nav/index.js

@@ -49,9 +49,9 @@ const NavigationBar = () => {
         <NavItem href="/#/">综合展示</NavItem>
         <NavItem href="/#/water-supply">供水</NavItem>
         <NavItem href="/#/sewage">污水</NavItem>
-        <NavItem>管网</NavItem>
-        <NavItem>泵站</NavItem>
-        <NavItem>防汛调度</NavItem>
+        <NavItem href="/#/pine-net">管网</NavItem>
+        <NavItem href="/#/pump-station">泵站</NavItem>
+        <NavItem href="/#/flood-control">防汛调度</NavItem>
       </div>
     </Navbar>
   );

src/components/centerPage/charts/BMap.js

@@ -215,6 +215,7 @@ class BMap extends PureComponent {
                 title={item.name}
                 position={item.position}
                 points={item.points}
+                data={item.data}
               />
             ))}
 
@@ -228,6 +229,7 @@ class BMap extends PureComponent {
                 title={item.name}
                 position={item.position}
                 points={item.points}
+                data={item.data}
               />
             ))}
         </Map>