数据填充

package.json

@@ -13,6 +13,7 @@
     "bmap-draw": "^1.0.9",
     "dva": "^2.4.1",
     "echarts": "^4.9.0",
+    "moment": "^2.29.4",
     "node-sass": "^4.14.1",
     "react": "^16.2.0",
     "react-bmapgl": "^0.2.17",

public/index.html

@@ -31,8 +31,8 @@
   .drawing-panel {
     z-index: 999;
     position: absolute;
-    top: 0.5rem;
-    margin-left: 0.5rem;
+    right: 6rem;
+    bottom: 0.5rem;
     padding-left: 0;
     border-radius: 0.25rem;
     height: 47px;

src/components/FloodControl/MaterialsPrepare.js

@@ -68,7 +68,7 @@ class MaterialsPrepare extends PureComponent {
           name: "aha",
           type: "bar",
           barWidth: "50%",
-          data: [12, 26, 9, 16, 7, 30, 5],
+          data: [1200, 1000, 1100, 100, 200, 220, 90],
         },
       ],
     };

src/components/FloodControl/PersonManagement.jsx

@@ -12,28 +12,28 @@ const PersonManagement = () => {
           name: "管网中心",
           children: [
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "杜灿",
+              phone: "13227068863",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "曹洋",
+              phone: "15622114801",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "代燕",
+              phone: "13199959991",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "彭礼旭",
+              phone: "15599947779",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "郭涛",
+              phone: "13369690557",
               state: "在线",
             },
           ],
@@ -42,28 +42,28 @@ const PersonManagement = () => {
           name: "管网中心2",
           children: [
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "田恒铭",
+              phone: "13899161889",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "王昱霖",
+              phone: "13899189567",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "王钰莹",
+              phone: "18940169999",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "杨海蓝",
+              phone: "13573734658",
               state: "在线",
             },
             {
-              name: "李某某",
-              phone: "132999900900",
+              name: "杨红菊",
+              phone: "13509734658",
               state: "在线",
             },
           ],
@@ -74,28 +74,28 @@ const PersonManagement = () => {
       name: "泵站运维",
       children: [
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "杨青城",
+          phone: "15122280828",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "张嘉钰",
+          phone: "15119990923",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "张振",
+          phone: "15219990923",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "赵云海",
+          phone: "18774658888",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "唐金玉",
+          phone: "15919990923",
           state: "在线",
         },
       ],
@@ -104,48 +104,48 @@ const PersonManagement = () => {
       name: "官网运维",
       children: [
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "陈蓉",
+          phone: "13000069234",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "尹岚",
+          phone: "18257345064",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "蒋春辉",
+          phone: "18963152785",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "高启强",
+          phone: "13675518463",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "张晓倩",
+          phone: "18882480278",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "林平之",
+          phone: "13118529999",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "刘军",
+          phone: "13564822451",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "许建军",
+          phone: "13725454659",
           state: "在线",
         },
         {
-          name: "李某某",
-          phone: "132999900900",
+          name: "邓甲富",
+          phone: "15548719999",
           state: "在线",
         },
       ],

src/components/FloodControl/WarnMessage.js

@@ -32,13 +32,13 @@ class WarnMessage extends PureComponent {
     const data = {
       header: ["报警内容", "报警区域", "报警时间", "报警来源"],
       data: [
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
-        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "西外环普照园门口", "2022-07-11", "系统平台"],
+        ["液位超高", "八一立交桥下", "2022-07-18", "系统平台"],
+        ["液位超高", "经四路林祥门路口", "2022-07-25", "市民反馈"],
+        ["液位超高", "玉函路济大路路口", "2022-07-16", "市民反馈"],
+        ["液位超高", "108国道桃花沟路口", "2022-08-08", "问题上报"],
+        ["液位超高", "白马山南路全线", "2022-08-18", "系统平台"],
+        ["液位超高", "南外环杨庄铁路附近", "2022-08-26", "系统平台"],
       ],
     };
     const config = {

src/components/FloodControl/WaterLevel.js

@@ -55,9 +55,9 @@ class WaterLevel extends PureComponent {
               color: "#fff",
             },
           },
-          axisLabel: {
-            show: false,
-          },
+          // axisLabel: {
+          //   show: false,
+          // },
           splitLine: {
             show: false,
           },
@@ -65,22 +65,22 @@ class WaterLevel extends PureComponent {
       ],
       series: [
         {
-          name: "区域1",
-          data: [820, 932, 901, 934, 1290, 1330, 1320],
+          name: "浆水泉立交桥下",
+          data: [0.1, 0.2, 0.23, 0.25, 0.4, 0.42, 0.45],
           type: "line",
           smooth: true,
           showSymbol: false, //不展示拐点圆圈
         },
         {
-          name: "区域2",
-          data: [560, 672, 561, 254, 1230, 1460, 1640],
+          name: "千佛山西路北口",
+          data: [0.2, 0.3, 0.33, 0.32, 0.31, 0.3, 0.24],
           type: "line",
           smooth: true,
           showSymbol: false, //不展示拐点圆圈
         },
         {
-          name: "区域3",
-          data: [460, 472, 561, 654, 830, 1860, 1740],
+          name: "二环西路张庄路西",
+          data: [0.4, 0.41, 0.41, 0.42, 0.44, 0.41, 0.43],
           type: "line",
           smooth: true,
           showSymbol: false, //不展示拐点圆圈

src/components/FloodControl/indexCenter.js

@@ -16,8 +16,8 @@ class index extends PureComponent {
     super(props);
     this.state = {
       data: [
-        { name: "内涝点总数", value: "28%" },
-        { name: "内涝点消除率", value: "28%" },
+        { name: "内涝点总数", value: "67" },
+        { name: "内涝点消除率", value: "86%" },
       ],
     };
   }
@@ -40,9 +40,9 @@ class index extends PureComponent {
             ShowIconType.Personnel,
             ShowIconType.Car,
             ShowIconType.Waterlogging,
-            ShowIconType.Video,
+            // ShowIconType.Video,
             ShowIconType.Rainfall,
-            ShowIconType.Flow,
+            // ShowIconType.Flow,
             ShowIconType.All,
           ]}
         />

src/components/FloodControl/indexRight.js

@@ -18,17 +18,17 @@ class index extends PureComponent {
         <RightPage>
           <TopCon>
             <TopItem color="#2ed9cb42">
-              <img src={this.state.src1} />
+              <img style={{ width: "30%" }} src={this.state.src1} />
               <TopItemText>
-                <div>在线车辆</div>
+                <div style={{ marginBottom: "6px" }}>在线车辆</div>
                 <div>38 辆</div>
               </TopItemText>
             </TopItem>
             <TopItem color="#f1f00c42">
-              <img src={this.state.src1} />
+              <img style={{ width: "30%" }} src={this.state.src1} />
               <TopItemText>
-                <div>在线人员</div>
-                <div>38 人</div>
+                <div style={{ marginBottom: "6px" }}>在线人员</div>
+                <div>412 人</div>
               </TopItemText>
             </TopItem>
           </TopCon>

src/components/FloodControl/style.js

@@ -188,12 +188,13 @@ export const Line = styled.div`
 
 export const TopCon = styled.div`
   display: flex;
-  height: 60px;
+  height: 8vh;
   justify-content: space-between;
 `;
 export const TopItem = styled.div`
   display: flex;
   width: 49%;
+  align-items: center;
   padding: 10px;
   background-color: ${(props) => props.color};
   border: 1px solid #999494;

src/components/Map/Legend.js

@@ -26,7 +26,7 @@ const Box = styled.ul`
   z-index: 999;
   color: #fff;
   font-size: 16px;
-  bottom: 30%;
+  bottom: 44%;
   text-align: center;
   left: 26vw;
 `;

src/components/Map/MockData.js

@@ -9,7 +9,7 @@ export const ShowIconType = {
   Pump: 1, //泵
   PipeNet: 2, //官网
   BigUserCompany: 3, //企业
-  BigUserWaterMeter: 4, //水表
+  // BigUserWaterMeter: 4, //水表
   Waterlogging: 5, //内涝
   Flow: 6, //流量泵
   Rainfall: 7, //降雨量
@@ -20,6 +20,9 @@ export const ShowIconType = {
 
   InPipeNet: 21, //供水官网
   OutPipeNet: 22, //排水官网
+
+  SupplyWorks: 23, //供水厂
+  SewageWorks: 24, //污水厂
 };
 
 export const IconType = {
@@ -34,6 +37,7 @@ export const IconType = {
   Video: null,
   Personnel: "iconPerson",
   Car: "iconCar",
+  SewageWorks: "iconWater",
 };
 
 export const PipeData = [
@@ -48,13 +52,84 @@ export const PipeData = [
         fillColor: "#0ab8d9",
         fillOpacity: 0.3,
         position: [
-          { lng: 116.39829290421633, lat: 40.18892017402776 },
-          { lng: 116.25916334683096, lat: 40.169957230404016 },
-          { lng: 116.12003378944557, lat: 40.150988945208915 },
-          { lng: 116.13440667760521, lat: 40.04060244030742 },
-          { lng: 116.14877956576487, lat: 39.930035509314486 },
-          { lng: 116.19799852535938, lat: 39.8634192849549 },
-          { lng: 116.24721748495391, lat: 39.796737802722014 },
+          { lng: 117.07188004490497, lat: 36.70497323104637 },
+          { lng: 117.07666374648078, lat: 36.69726882795547 },
+          { lng: 117.07883855408693, lat: 36.69326550093242 },
+          { lng: 117.07977061448956, lat: 36.688010815111866 },
+          { lng: 117.08070267489221, lat: 36.68075374875517 },
+          { lng: 117.08101336169308, lat: 36.673495991708435 },
+          { lng: 117.0779064936843, lat: 36.65597442239747 },
+          { lng: 117.07573168607816, lat: 36.65121787362695 },
+          { lng: 117.07573168607816, lat: 36.64796322211418 },
+          { lng: 117.07666374648078, lat: 36.64045195831464 },
+          { lng: 117.07386756527289, lat: 36.63419200741575 },
+          { lng: 117.07045001046323, lat: 36.62943410159909 },
+          { lng: 117.07013932366236, lat: 36.62167056648264 },
+          { lng: 117.07200344446763, lat: 36.61616048239428 },
+          { lng: 117.07573168607816, lat: 36.60739362084672 },
+          { lng: 117.08318816929923, lat: 36.602133021359734 },
+          { lng: 117.09530495453347, lat: 36.59010743503786 },
+          { lng: 117.099033196144, lat: 36.57883173090869 },
+          { lng: 117.0993438829449, lat: 36.57908232016174 },
+        ],
+      },
+      {
+        strokeColor: "red",
+        strokeWeight: 0.5,
+        fillColor: "#0ab8d9",
+        fillOpacity: 0.3,
+        position: [
+          { lng: 116.94201421856121, lat: 36.59797447579483 },
+          { lng: 116.96107697354121, lat: 36.59797447579483 },
+          { lng: 116.97393325015565, lat: 36.59976184319677 },
+          { lng: 116.98634620688682, lat: 36.59976184319677 },
+          { lng: 117.00673892151663, lat: 36.60226408738601 },
+          { lng: 116.99432596478543, lat: 36.57723796164166 },
+          { lng: 117.00363568233382, lat: 36.56043011285586 },
+          { lng: 117.00496564198359, lat: 36.55434976960561 },
+          { lng: 117.0200385180143, lat: 36.52250950753011 },
+          { lng: 117.02651651258338, lat: 36.50378811706299 },
+          { lng: 117.02651651258338, lat: 36.50378811706299 },
+        ],
+      },
+      {
+        strokeColor: "red",
+        strokeWeight: 2,
+        fillColor: "#0ab8d9",
+        fillOpacity: 0.3,
+        position: [
+          { lng: 117.00670613351323, lat: 36.60228964745086 },
+          { lng: 117.01111700307806, lat: 36.603314415094495 },
+          { lng: 117.03952599349503, lat: 36.60385693358163 },
+          { lng: 117.04707680410587, lat: 36.60849832330671 },
+          { lng: 117.05268384168816, lat: 36.60807639042833 },
+          { lng: 117.06090749680888, lat: 36.612114795320814 },
+          { lng: 117.0639266962617, lat: 36.61526798794534 },
+          { lng: 117.07231036678724, lat: 36.619641184630694 },
+          { lng: 117.07812962044612, lat: 36.62146990177344 },
+          { lng: 117.10594368030722, lat: 36.62337808170266 },
+          { lng: 117.12273695338396, lat: 36.61816387314827 },
+          { lng: 117.1270353956499, lat: 36.6182605234293 },
+          { lng: 117.13315240964373, lat: 36.61985982703701 },
+          { lng: 117.14455981411871, lat: 36.62718954035145 },
+          { lng: 117.15695916680889, lat: 36.62905517329928 },
+          { lng: 117.16552400229295, lat: 36.63414340378668 },
+          { lng: 117.16552400229295, lat: 36.63414340378668 },
+        ],
+      },
+      {
+        strokeColor: "red",
+        strokeWeight: 2,
+        fillColor: "#0ab8d9",
+        fillOpacity: 0.3,
+        position: [
+          { lng: 117.00653126895332, lat: 36.60218701980177 },
+          { lng: 117.01254759529783, lat: 36.62184416526905 },
+          { lng: 117.0157140828476, lat: 36.62694909036575 },
+          { lng: 117.01729732662244, lat: 36.639709910958565 },
+          { lng: 117.01983051666225, lat: 36.64430328450691 },
+          { lng: 117.01959564703613, lat: 36.662122849219024 },
+          { lng: 117.01920551782146, lat: 36.662093109818656 },
         ],
       },
     ],
@@ -80,118 +155,199 @@ export const PipeData = [
           { lng: 116.5466211100239, lat: 40.15672410636046 },
         ],
       },
+      {
+        strokeColor: "#66ccff",
+        strokeWeight: 2,
+        fillColor: "#0ab8d9",
+        fillOpacity: 0.3,
+        position: [
+          { lng: 116.94988193616678, lat: 36.65670191951822 },
+          { lng: 116.96721588108008, lat: 36.65483006438672 },
+          { lng: 117.01957511674604, lat: 36.65483006438672 },
+          { lng: 117.04316357786517, lat: 36.65454208259972 },
+          { lng: 117.06299932926082, lat: 36.6538221233786 },
+          { lng: 117.07229175333805, lat: 36.65655793229175 },
+          { lng: 117.0885534954732, lat: 36.658429745047926 },
+          { lng: 117.11517986446374, lat: 36.665916536990025 },
+          { lng: 117.13208235357584, lat: 36.666354675085486 },
+          { lng: 117.14229676757444, lat: 36.665386530481655 },
+          { lng: 117.16733209600235, lat: 36.67345402680362 },
+          { lng: 117.16733209600235, lat: 36.67345402680362 },
+        ],
+      },
+      // {
+      //   strokeColor: "#66ccff",
+      //   strokeWeight: 2,
+      //   fillColor: "#0ab8d9",
+      //   fillOpacity: 0.3,
+      //   position: [
+      //     { lng: 117.00653126895332, lat: 36.60218701980177 },
+      //     { lng: 117.01254759529783, lat: 36.62184416526905 },
+      //     { lng: 117.0157140828476, lat: 36.62694909036575 },
+      //     { lng: 117.01729732662244, lat: 36.639709910958565 },
+      //     { lng: 117.01983051666225, lat: 36.64430328450691 },
+      //     { lng: 117.01959564703613, lat: 36.662122849219024 },
+      //     { lng: 117.01920551782146, lat: 36.662093109818656 },
+      //   ],
+      // },
+      {
+        strokeColor: "#66ccff",
+        strokeWeight: 2,
+        fillColor: "#0ab8d9",
+        fillOpacity: 0.3,
+        position: [
+          { lng: 117.01802847383759, lat: 36.60362216255748 },
+          { lng: 117.01802847383759, lat: 36.608489583919656 },
+          { lng: 117.02132132203471, lat: 36.61258240296252 },
+          { lng: 117.02241893810042, lat: 36.62054617952791 },
+          { lng: 117.02900463449465, lat: 36.63768760468906 },
+          { lng: 117.02914183650287, lat: 36.643105706718075 },
+          { lng: 117.03092546260963, lat: 36.64730723547956 },
+          { lng: 117.03146584479022, lat: 36.66670690443956 },
+          { lng: 117.03146584479022, lat: 36.66625383322674 },
+        ],
+      },
     ],
   },
 ];
 
-export default [
+export const WaterWorks = [
+  {
+    type: ShowIconType.SewageWorks,
+    name: "污水厂",
+    icon: IconType.SewageWorks,
+    data: [
+      {
+        name: "平阴区污水处理厂",
+        position: { lng: 116.845265, lat: 36.763525 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "美洁污水处理厂",
+        position: { lng: 117.111609, lat: 36.832063 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "济南西区污水处理厂",
+        position: { lng: 116.753323, lat: 36.577857 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "章丘污水处理厂",
+        position: { lng: 117.534918, lat: 36.718595 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "高新区水质净化一厂",
+        position: { lng: 117.14658, lat: 36.710977 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "腊山污水处理厂",
+        position: { lng: 116.89706, lat: 36.644871 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "光大水务一厂",
+        position: { lng: 117.048775, lat: 36.709265 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+      {
+        name: "光大水务二厂",
+        position: { lng: 117.466926, lat: 36.914682 },
+        data: getData(ShowIconType.SewageWorks),
+      },
+    ],
+  },
   {
     type: 0,
     name: "水厂",
-    icon: IconType.WaterWorks,
+    icon: IconType.SupplyWorks,
     data: [
       {
-        name: "第一水厂",
-        position: { lng: 116.342544, lat: 39.918216 },
-        data: [
-          {
-            type: ItemType.progressBar,
-            name: "运行负荷",
-            value: "90%",
-          },
-          {
-            name: "进水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "进场流量",
-            value: "330 mg/L",
-          },
-          {
-            name: "出场流量",
-            value: "330 mg/L",
-          },
-        ],
+        name: "鹊华水厂",
+        position: { lng: 117.063061, lat: 36.740403 },
+        data: getData(ShowIconType.WaterWorks),
       },
       {
-        name: "第二水厂",
-        position: { lng: 116.322544, lat: 39.958216 },
-        data: [
-          {
-            type: ItemType.progressBar,
-            name: "运行负荷",
-            value: "90%",
-          },
-          {
-            name: "进水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "进场流量",
-            value: "330 mg/L",
-          },
-          {
-            name: "出场流量",
-            value: "330 mg/L",
-          },
-        ],
+        name: "玉清水厂",
+        position: { lng: 116.888463, lat: 36.651678 },
+        data: getData(ShowIconType.WaterWorks),
       },
       {
-        name: "第三水厂",
-        position: { lng: 116.492544, lat: 39.978216 },
-        data: [
-          {
-            type: ItemType.progressBar,
-            name: "运行负荷",
-            value: "90%",
-          },
-          {
-            name: "进水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "进场流量",
-            value: "330 mg/L",
-          },
-          {
-            name: "出场流量",
-            value: "330 mg/L",
-          },
-        ],
+        name: "南郊水厂",
+        position: { lng: 115.457185, lat: 36.469219 },
+        data: getData(ShowIconType.WaterWorks),
+      },
+      {
+        name: "东郊水厂",
+        position: { lng: 117.590842, lat: 34.849896 },
+        data: getData(ShowIconType.WaterWorks),
+      },
+      {
+        name: "青龙山水厂",
+        position: { lng: 117.550168, lat: 35.674475 },
+        data: getData(ShowIconType.WaterWorks),
+      },
+      {
+        name: "白龙泉水厂",
+        position: { lng: 117.561738, lat: 35.514622 },
+        data: getData(ShowIconType.WaterWorks),
+      },
+      {
+        name: "水帘峡山泉水厂",
+        position: { lng: 117.228579, lat: 36.420463 },
+        data: getData(ShowIconType.WaterWorks),
+      },
+      {
+        name: "大禹王水厂",
+        position: { lng: 116.659103, lat: 36.950534 },
+        data: getData(ShowIconType.WaterWorks),
       },
     ],
   },
+];
+
+function getRandom(min, max) {
+  return Math.round((Math.random() * (max - min) + min) * 10) / 10;
+}
+
+export default [
+  {
+    type: 0,
+    name: "水厂",
+    icon: IconType.WaterWorks,
+    data: [...WaterWorks.map((item) => item.data).flat(1)],
+  },
   {
     type: 1,
     name: "泵站",
     icon: IconType.Pump,
     data: [
       {
-        name: "第一泵站",
-        position: { lng: 116.332544, lat: 39.898216 },
-        data: [
-          {
-            type: ItemType.pump,
-            name: "泵运行状态",
-            value: [0, 0, 1, 0],
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-        ],
+        name: "凤凰路一级泵站",
+        position: { lng: 117.179155, lat: 36.664637 },
+        data: getData(ShowIconType.Pump),
+      },
+      {
+        name: "凤凰路二级泵站",
+        position: { lng: 117.167801, lat: 36.63325 },
+        data: getData(ShowIconType.Pump),
+      },
+      {
+        name: "凤凰路三级泵站",
+        position: { lng: 117.162627, lat: 36.669269 },
+        data: getData(ShowIconType.Pump),
+      },
+      {
+        name: "大涧沟雨水泵站",
+        position: { lng: 117.010076, lat: 36.572451 },
+        data: getData(ShowIconType.Pump),
+      },
+      {
+        name: "纬十二路雨水泵站",
+        position: { lng: 116.979802, lat: 36.663158 },
+        data: getData(ShowIconType.Pump),
       },
     ],
   },
@@ -199,111 +355,120 @@ export default [
     type: 2,
     name: "管网",
     icon: IconType.PipeNet,
+    data: [...PipeData.map((item) => item.data).flat(1)],
+  },
+  {
+    type: 3,
+    name: "大用户企业",
+    icon: IconType.BigUserCompany,
     data: [
       {
-        strokeColor: "red",
-        strokeWeight: 2,
-        fillColor: "#0ab8d9",
-        fillOpacity: 0.3,
-        position: [
-          { lng: 116.39829290421633, lat: 40.18892017402776 },
-          { lng: 116.25916334683096, lat: 40.169957230404016 },
-          { lng: 116.12003378944557, lat: 40.150988945208915 },
-          { lng: 116.13440667760521, lat: 40.04060244030742 },
-          { lng: 116.14877956576487, lat: 39.930035509314486 },
-          { lng: 116.19799852535938, lat: 39.8634192849549 },
-          { lng: 116.24721748495391, lat: 39.796737802722014 },
-        ],
+        name: `${getRandom(500, 1000)}m3`, //"统一企业有限公司",
+        position: { lng: 117.185071, lat: 37.002122 },
       },
       {
-        strokeColor: "#66ccff",
-        strokeWeight: 2,
-        fillColor: "#0ab8d9",
-        fillOpacity: 0.3,
-        position: [
-          { lng: 116.24721748495391, lat: 39.796737802722014 },
-          { lng: 116.322837465736, lat: 39.78383959531996 },
-          { lng: 116.39845744651808, lat: 39.77093895027502 },
-          { lng: 116.53865456380538, lat: 39.74764618546205 },
-          { lng: 116.67885168109265, lat: 39.724345479834405 },
-          { lng: 116.68690049846205, lat: 39.924723760492924 },
-          { lng: 116.69494931583147, lat: 40.12451264487721 },
-          { lng: 116.5466211100239, lat: 40.15672410636046 },
-        ],
+        name: `${getRandom(500, 1000)}m3`, //"济南炼油厂济南分公司",
+        position: { lng: 117.181912, lat: 36.69513 },
+      },
+      {
+        name: `${getRandom(500, 1000)}m3`, //"济南盐业公司",
+        position: { lng: 116.954083, lat: 36.729286 },
+      },
+      {
+        name: `${getRandom(500, 1000)}m3`, //"济南铁塔",
+        position: { lng: 117.012108, lat: 36.654583 },
       },
     ],
   },
+  // {
+  //   type: 4,
+  //   name: "大用户水表",
+  //   icon: IconType.BigUserWaterMeter,
+  //   data: [
+  //     {
+  //       name: "XX物业公司",
+  //       position: { lng: 116.314544, lat: 39.908216 },
+  //       data: [
+  //         {
+  //           name: "出水COD",
+  //           value: "330 mg/L",
+  //         },
+  //         {
+  //           name: "出水COD",
+  //           value: "330 mg/L",
+  //         },
+  //         {
+  //           name: "出水COD",
+  //           value: "330 mg/L",
+  //         },
+  //         {
+  //           name: "出水COD",
+  //           value: "330 mg/L",
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // },
   {
-    type: 3,
-    name: "大用户企业",
-    icon: IconType.BigUserCompany,
+    type: 5,
+    name: "内涝点",
+    icon: IconType.Waterlogging,
     data: [
       {
-        name: "第一泵站",
-        position: { lng: 116.394544, lat: 39.938216 },
+        name: "西外环普照园门口",
+        current: "0.23m",
+        position: { lng: 116.936345, lat: 36.64941 },
         data: [
           {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
-          },
-          {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "液位",
+            value: "0.23m",
           },
           {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "视频",
+            value: "查看",
           },
         ],
       },
-    ],
-  },
-  {
-    type: 4,
-    name: "大用户水表",
-    icon: IconType.BigUserWaterMeter,
-    data: [
       {
-        name: "XX物业公司",
-        position: { lng: 116.314544, lat: 39.908216 },
+        name: "八一立交桥下",
+        current: "0.35m",
+        position: { lng: 117.004416, lat: 36.654859 },
         data: [
           {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "液位",
+            value: "0.35m",
           },
           {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "视频",
+            value: "查看",
           },
+        ],
+      },
+      ,
+      {
+        name: "经四路林祥门路口",
+        current: "0.27m",
+        position: { lng: 117.009407, lat: 36.668131 },
+        data: [
           {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "液位",
+            value: "0.27m",
           },
           {
-            name: "出水COD",
-            value: "330 mg/L",
+            name: "视频",
+            value: "查看",
           },
         ],
       },
-    ],
-  },
-  {
-    type: 5,
-    name: "内涝点",
-    icon: IconType.Waterlogging,
-    data: [
+      ,
       {
-        name: "XX区域",
-        current: "0.23m",
-        position: { lng: 116.304544, lat: 39.818216 },
+        name: "玉函路济大路路口",
+        current: "0.15m",
+        position: { lng: 117.01753, lat: 36.639387 },
         data: [
           {
             name: "液位",
-            value: "0.23m",
+            value: "0.15m",
           },
           {
             name: "视频",
@@ -311,42 +476,74 @@ export default [
           },
         ],
       },
-    ],
-  },
-  {
-    type: 6,
-    name: "流量",
-    icon: IconType.Flow,
-    data: [
+      ,
       {
-        name: "水泵",
-        position: { lng: 116.424544, lat: 39.998216 },
+        name: "白马山南路全线",
+        current: "0.36m",
+        position: { lng: 116.949576, lat: 116.949576 },
         data: [
           {
-            name: "所在区域",
-            value: "XXXX",
+            name: "液位",
+            value: "0.36m",
           },
           {
-            name: "流量",
-            value: "1.3 m3/h",
+            name: "视频",
+            value: "查看",
           },
+        ],
+      },
+      ,
+      {
+        name: "南外环杨庄铁路",
+        current: "0.24m",
+        position: { lng: 116.724204, lat: 36.532568 },
+        data: [
           {
-            name: "负责人",
-            value: "XXXX",
+            name: "液位",
+            value: "0.24m",
           },
           {
-            name: "电话",
-            value: "13811111111",
+            name: "视频",
+            value: "查看",
           },
         ],
-        points: [
-          { lng: 116.24721748495391, lat: 39.796737802722014 },
-          { lng: 116.322837465736, lat: 39.78383959531996 },
-          { lng: 116.424544, lat: 39.998216 },
-        ],
       },
     ],
   },
+  // {
+  //   type: 6,
+  //   name: "流量",
+  //   icon: IconType.Flow,
+  //   data: [
+  //     {
+  //       name: "水泵",
+  //       position: { lng: 116.424544, lat: 39.998216 },
+  //       data: [
+  //         {
+  //           name: "所在区域",
+  //           value: "XXXX",
+  //         },
+  //         {
+  //           name: "流量",
+  //           value: "1.3 m3/h",
+  //         },
+  //         {
+  //           name: "负责人",
+  //           value: "XXXX",
+  //         },
+  //         {
+  //           name: "电话",
+  //           value: "13811111111",
+  //         },
+  //       ],
+  //       points: [
+  //         { lng: 116.24721748495391, lat: 39.796737802722014 },
+  //         { lng: 116.322837465736, lat: 39.78383959531996 },
+  //         { lng: 116.424544, lat: 39.998216 },
+  //       ],
+  //     },
+  //   ],
+  // },
   {
     type: 7,
     name: "降雨量",
@@ -354,48 +551,49 @@ export default [
     icon: IconType.Rainfall,
     data: [
       {
-        name: "XX区域",
-        position: { lng: 116.564544, lat: 39.998216 },
-      },
-    ],
-  },
-  {
-    type: 8,
-    name: "视频",
-    icon: IconType.Video,
-    data: [
-      {
-        name: "XX区域",
-        position: { lng: 116.534544, lat: 39.848216 },
+        name: "济南站附件",
+        position: { lng: 116.870417, lat: 36.661798 },
       },
     ],
   },
+  // {
+  //   type: 8,
+  //   name: "视频",
+  //   icon: IconType.Video,
+  //   data: [
+  //     {
+  //       name: "XX区域",
+  //       position: { lng: 116.534544, lat: 39.848216 },
+  //     },
+  //   ],
+  // },
   {
     type: 9,
     name: "人员",
     icon: IconType.Personnel,
     data: [
       {
-        name: "张三",
-        position: { lng: 116.334544, lat: 39.748216 },
+        name: "王昱霖",
+        position: { lng: 117.00351, lat: 36.658266 },
         data: [
           {
             name: "部门",
-            value: "管网维修",
+            value: "管网中心2",
           },
           {
             name: "所在区域",
-            value: "XXX",
+            value: "市中区",
           },
           {
             name: "电话",
-            value: "13811111111",
+            value: "13899189567",
           },
         ],
         points: [
-          { lng: 116.65721748495391, lat: 39.796737802722014 },
-          { lng: 116.502837465736, lat: 39.78383959531996 },
-          { lng: 116.334544, lat: 39.748216 },
+          { lng: 116.996611, lat: 36.661711 },
+          { lng: 117.004192, lat: 36.662348 },
+          { lng: 117.00351, lat: 36.659163 },
+          { lng: 117.00351, lat: 36.658266 },
         ],
       },
     ],
@@ -407,27 +605,170 @@ export default [
     data: [
       {
         name: "抢修车01",
-        position: { lng: 116.534544, lat: 39.848216 },
+        position: { lng: 116.937237, lat: 36.649659 },
         data: [
           {
             name: "所在区域",
-            value: "XXX",
+            value: "安澜北路",
           },
           {
             name: "负责人",
-            value: "李四",
+            value: "杨青城",
           },
           {
             name: "电话",
-            value: "13811111111",
+            value: "15122280828",
           },
         ],
         points: [
-          { lng: 116.44721748495391, lat: 39.816737802722014 },
-          { lng: 116.452837465736, lat: 39.90383959531996 },
-          { lng: 116.534544, lat: 39.848216 },
+          { lng: 116.93421, lat: 36.64967 },
+          { lng: 116.936698, lat: 36.649945 },
+          { lng: 116.937246, lat: 36.650133 },
+          { lng: 116.937237, lat: 36.649659 },
         ],
       },
     ],
   },
 ];
+
+function getData(type) {
+  let result = [];
+  switch (type) {
+    case ShowIconType.WaterWorks:
+      result = [
+        {
+          type: ItemType.progressBar,
+          name: "运行负荷",
+          value: `${getRandom(70, 98)}%`,
+        },
+        {
+          name: "进水COD",
+          value: `${getRandom(15, 20)}mg/L`,
+        },
+        {
+          name: "出水COD",
+          value: `${getRandom(2, 5)}mg/L`,
+        },
+        {
+          name: "进场流量",
+          value: `${getRandom(19, 21)}万m3`,
+        },
+        {
+          name: "出场流量",
+          value: `${getRandom(17, 19)}万m3`,
+        },
+        {
+          name: "进水氨氮",
+          value: `${getRandom(0.5, 1)}mg/L`,
+        },
+        {
+          name: "出水氨氮",
+          value: `${getRandom(0.1, 0.5)}mg/L`,
+        },
+        {
+          name: "进水PH",
+          value: `${getRandom(6, 9)}`,
+        },
+        {
+          name: "出水PH",
+          value: `${getRandom(6.5, 9.5)}mg/L`,
+        },
+        {
+          name: "出水浊度",
+          value: `${getRandom(0.1, 1)}mg/L`,
+        },
+      ];
+      break;
+    case ShowIconType.SewageWorks:
+      result = [
+        {
+          type: ItemType.progressBar,
+          name: "运行负荷",
+          value: `${getRandom(70, 98)}%`,
+        },
+        {
+          name: "进水COD",
+          value: `${getRandom(300, 600)}mg/L`,
+        },
+        {
+          name: "出水COD",
+          value: `${getRandom(20, 50)}mg/L`,
+        },
+        {
+          name: "进场流量",
+          value: `${getRandom(19, 21)}万m3`,
+        },
+        {
+          name: "出场流量",
+          value: `${getRandom(17, 19)}万m3`,
+        },
+        {
+          name: "进水氨氮",
+          value: `${getRandom(20, 25)}mg/L`,
+        },
+        {
+          name: "出水氨氮",
+          value: `${getRandom(6, 10)}mg/L`,
+        },
+        {
+          name: "进水PH",
+          value: `${getRandom(6, 9)}`,
+        },
+        {
+          name: "出水PH",
+          value: `${getRandom(6.5, 8.5)}`,
+        },
+        {
+          name: "进水总氮",
+          value: `${getRandom(30, 70)}mg/L`,
+        },
+        {
+          name: "出水总氮",
+          value: `${getRandom(10, 15)}mg/L`,
+        },
+        {
+          name: "进水总磷",
+          value: `${getRandom(5, 10)}mg/L`,
+        },
+        {
+          name: "出水总磷",
+          value: `${getRandom(0.3, 1)}mg/L`,
+        },
+      ];
+      break;
+    case ShowIconType.Pump:
+      result = [
+        {
+          name: "能耗",
+          value: `${getRandom(60000, 90000)}kWh`,
+        },
+        {
+          name: "栅前液位",
+          value: `${getRandom(1.5, 2.5)}m`,
+        },
+        {
+          name: "流量",
+          value: `${getRandom(200, 300)}m3/h`,
+        },
+        {
+          type: ItemType.pump,
+          name: "泵运行状态",
+          value: [0, 0, 1, 0],
+        },
+        {
+          name: "COD",
+          value: `${getRandom(2, 5)}mg/L`,
+        },
+        {
+          name: "氨氮",
+          value: `${getRandom(0.2, 0.5)}mg/L`,
+        },
+        {
+          name: "PH",
+          value: `${getRandom(6, 9)}`,
+        },
+      ];
+      break;
+  }
+  return result;
+}

src/components/Overview/EnergyRanking .js

@@ -17,12 +17,13 @@ class EnergyRanking extends PureComponent {
   render() {
     const userIdentityCategory = {
       data: [
-        { value: 100, name: "第三水厂" },
-        { value: 90, name: "第五水厂" },
-        { value: 85, name: "第二水厂" },
-        { value: 84, name: "第一水厂" },
-        { value: 70, name: "第七水厂" },
+        { value: 0.6, name: "南郊水厂" },
+        { value: 0.65, name: "白龙泉水厂" },
+        { value: 0.73, name: "大禹王水厂" },
+        { value: 0.81, name: "东郊水厂" },
+        { value: 0.9, name: "鹊华水厂" },
       ],
+      unit: "kWh/m3",
     };
     const config = {
       ...this.state.config,

src/components/Overview/FloodStat.js

@@ -10,12 +10,6 @@ class FloodStat extends PureComponent {
     return {
       color: ["#38b3ff", "#00CA95"],
       tooltip: {},
-      legend: {
-        data: ["内涝点数量", "受损内涝点数量"],
-        textStyle: {
-          color: "#fff",
-        },
-      },
       grid: {
         top: 35,
         left: "3%",
@@ -27,14 +21,13 @@ class FloodStat extends PureComponent {
         {
           type: "category",
           data: [
-            "区域1",
-            "区域2",
-            "区域3",
-            "区域4",
-            "区域5",
-            "区域6",
-            "区域7",
-            "区域8",
+            "市中区",
+            "历下区",
+            "槐荫区",
+            "天桥区",
+            "历城区",
+            "长清区",
+            "章丘区",
           ],
           axisLabel: {
             textStyle: {
@@ -51,7 +44,7 @@ class FloodStat extends PureComponent {
       ],
       yAxis: [
         {
-          name: "（个）",
+          name: "内涝点数量（个）",
           type: "value",
           axisLabel: {
             textStyle: {
@@ -64,20 +57,17 @@ class FloodStat extends PureComponent {
               color: "#fff",
             },
           },
+          nameTextStyle: {
+            align: "left",
+          },
         },
       ],
       series: [
         {
           name: "内涝点数量",
-          type: "line",
-          smooth: true,
-          data: [20, 35, 18, 25, 30, 28, 36, 42],
-        },
-        {
-          name: "受损内涝点数量",
           type: "bar",
           barWidth: "50%",
-          data: [12, 26, 9, 16, 21, 12, 28, 18],
+          data: [36, 20, 32, 28, 41, 12, 36],
         },
       ],
     };

src/components/Overview/PipelineMonitoring.js

@@ -8,7 +8,7 @@ class PipelineMonitoring extends PureComponent {
   }
   getOptions() {
     return {
-      color: ["#00CA95"],
+      color: ["#38b3ff", "#00CA95"],
       tooltip: {},
       legend: {
         textStyle: {
@@ -56,7 +56,7 @@ class PipelineMonitoring extends PureComponent {
       yAxis: [
         {
           type: "value",
-          name: "流量（m3/h）",
+          name: "流量（万m3/h）",
           axisLine: {
             lineStyle: {
               color: "#fff",
@@ -65,16 +65,46 @@ class PipelineMonitoring extends PureComponent {
           axisLabel: {
             color: "#fff",
           },
+          nameTextStyle: {
+            align: "left",
+          },
+        },
+        {
+          name: "压力（MPa）",
+          type: "value",
+          splitLine: { show: false },
+          axisLabel: {
+            color: "#fff",
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#fff",
+            },
+          },
         },
       ],
       series: [
+        {
+          name: "压力",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+          yAxisIndex: 1,
+          data: [
+            0.31, 0.315, 0.2, 0.35, 0.33, 0.32, 0.328, 0.35, 0.3, 0.28, 0.22,
+            0.24, 0.35,
+          ],
+        },
         {
           name: "流量",
           type: "line",
           smooth: true,
           symbol: "none",
           areaStyle: {},
-          data: [25, 30, 28, 36, 42, 20, 28, 36, 42, 30, 35, 18, 16],
+          data: [
+            3.1, 3.15, 3.11, 3.3, 3.2, 3.25, 3.13, 3.18, 3.32, 3.33, 3.21, 3.27,
+            3.3,
+          ],
         },
       ],
     };

src/components/Overview/WaterPlantMonitoring.js

@@ -17,7 +17,7 @@ class WaterPlantMonitoring extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [150, 100, 100],
         // 对其方式
         align: ["center"],
         // 表行数
@@ -29,24 +29,16 @@ class WaterPlantMonitoring extends PureComponent {
   render() {
     const { height } = this.props;
     const userSitua = {
-      header: ["水厂名称", "浊度", "余氯", "pH"],
+      header: ["水厂名称", "浊度(NTU)", "余氯(mg/L)", "pH"],
       data: [
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["鹊华水厂", "0.14", "3.2", "8.3"],
+        ["玉清水厂", "0.27", "2.1", "7"],
+        ["南郊水厂", "0.12", "2.9", "8.8"],
+        ["东郊水厂", "0.22", "3.6", "7.1"],
+        ["青龙山水厂", "0.16", "1.5", "7.3"],
+        ["白龙泉水厂", "0.19", "1.8", "7.6"],
+        ["水帘峡山泉水厂", "0.24", "0.5", "8.2"],
+        ["大禹王水厂", "0.11", "0.7", "8.1"],
       ],
     };
     const config = {

src/components/Overview/WaterUsage.js

@@ -42,10 +42,10 @@ class WaterUsage extends PureComponent {
             show: false,
           },
           data: [
-            { value: 120, name: "饮用水" },
-            { value: 150, name: "工业用水" },
-            { value: 100, name: "绿化灌溉" },
-            { value: 80, name: "水源存储" },
+            { value: 45, name: "饮用水" },
+            { value: 30, name: "工业用水" },
+            { value: 15, name: "绿化灌溉" },
+            { value: 10, name: "水源存储" },
           ],
         },
       ],

src/components/Overview/WaterVolumeStat.js

@@ -8,15 +8,9 @@ class WaterVolumeStat extends PureComponent {
   }
   getOptions() {
     return {
-      color: ["#38b3ff", "#00CA95", "#8400FF"],
-      tooltip: {
-        // trigger: "axis",
-        // axisPointer: {
-        //   type: "cross",
-        // },
-      },
+      color: ["#38b3ff", "#07f217", "#ffdd00"],
+      tooltip: {},
       legend: {
-        // data: ["水量（m³）", "产销差（%）"],
         textStyle: {
           color: "#fff",
         },
@@ -60,7 +54,7 @@ class WaterVolumeStat extends PureComponent {
       yAxis: [
         {
           type: "value",
-          name: "水量（m³）",
+          name: "水量（万m³）",
           alignTicks: true,
           inside: true,
           axisLabel: {
@@ -99,19 +93,28 @@ class WaterVolumeStat extends PureComponent {
           type: "bar",
           barWidth: "20%",
           smooth: true,
-          data: [20, 35, 18, 25, 30, 28, 36, 42, 30, 28, 36, 42],
+          data: [
+            2650, 2680, 2700, 2550, 2479, 2620, 2510, 2660, 2690, 2530, 2590,
+            2510,
+          ],
         },
         {
           name: "销水量",
           type: "bar",
           barWidth: "20%",
           smooth: true,
-          data: [25, 30, 28, 36, 42, 20, 28, 36, 42, 30, 35, 18],
+          data: [
+            2385, 2444, 2565, 2346, 2478, 2489, 2508, 2553, 2636, 2454, 2512,
+            2484,
+          ],
         },
         {
           type: "line",
           name: "产销差率",
-          data: [12, 26, 9, 16, 21, 12, 28, 18, 26, 9, 16, 21],
+          data: [
+            2517.5, 2562, 2632.5, 2448, 2478.5, 2554.5, 2509, 2660.5, 2663,
+            2492, 2551, 2497,
+          ],
         },
       ],
     };

src/components/PineNet/DrainWaterPine.js

@@ -18,11 +18,11 @@ class DrainWaterPine extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [190],
         // 对其方式
         align: ["center"],
         // 表行数
-        rowNum: 6,
+        rowNum: 4,
       },
     };
   }
@@ -32,17 +32,9 @@ class DrainWaterPine extends PureComponent {
     const data = {
       header: ["名称", "单位", "本月", "同比"],
       data: [
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
+        ["大口径管道更新改造率 ", "%", "10", "2.0", "-1.1"],
+        ["管网维修及时率 ", "%", "95.2", "3.1", "1.4"],
+        ["人均巡检里程 ", "米/人", "50km", "-1.3", "3.2"],
       ],
     };
     const config = {

src/components/PineNet/NetworkOfDrains.js

@@ -0,0 +1,102 @@
+// 当月管网监测
+import React, { PureComponent } from "react";
+import Chart from "../../utils/chart";
+
+class NetworkOfDrains extends PureComponent {
+  constructor(props) {
+    super(props);
+  }
+  getOptions() {
+    return {
+      color: ["#00CA95"],
+      tooltip: {},
+      legend: {
+        textStyle: {
+          color: "#fff",
+        },
+      },
+      grid: {
+        left: "3%",
+        right: "3%",
+        bottom: "3%",
+        top: 35,
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: "category",
+          data: [
+            "03-01",
+            "03-02",
+            "03-03",
+            "03-04",
+            "03-05",
+            "03-06",
+            "03-07",
+            "03-08",
+            "03-09",
+            "03-10",
+            "03-11",
+            "03-12",
+            "03-13",
+          ],
+          axisLabel: {
+            textStyle: {
+              color: "#fff",
+              fontSize: 14,
+            },
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#fff",
+            },
+          },
+        },
+      ],
+      yAxis: [
+        {
+          type: "value",
+          name: "流量（万m3/h）",
+          axisLine: {
+            lineStyle: {
+              color: "#fff",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+          },
+          nameTextStyle: {
+            align: "left",
+          },
+        },
+      ],
+      series: [
+        {
+          name: "流量",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+          areaStyle: {},
+          data: [
+            2.8, 3, 2.72, 2.75, 2.93, 2.79, 3.01, 2.87, 2.83, 2.84, 2.96, 2.75,
+            2.91,
+          ],
+        },
+      ],
+    };
+  }
+  render() {
+    return (
+      <div
+        style={{
+          width: "100%",
+          height: "100%",
+        }}
+      >
+        <Chart option={this.getOptions()} />
+      </div>
+    );
+  } //endrender
+}
+
+export default NetworkOfDrains;

src/components/PineNet/WornAnalyze.js

@@ -26,7 +26,7 @@ class WornAnalyze extends PureComponent {
       xAxis: [
         {
           type: "category",
-          data: ["DMA1", "DMA2", "DMA3", "DMA4"],
+          data: ["历下区", "天桥区", "市中区", "章丘区", "高新区"],
           axisLabel: {
             textStyle: {
               color: "#fff",
@@ -74,7 +74,7 @@ class WornAnalyze extends PureComponent {
           name: "受损内涝点数量",
           type: "bar",
           barWidth: "50%",
-          data: [12, 26, 9, 16],
+          data: [12, 14, 18, 10, 16],
         },
       ],
     };

src/components/PineNet/indexCenter.js

@@ -10,11 +10,11 @@ class index extends PureComponent {
     super(props);
     this.state = {
       data: [
-        { name: "产销差率", value: "28%" },
-        { name: "综合漏损率", value: "28%" },
-        { name: "管网维修及时率", value: "28%" },
-        { name: "管网总长度", value: "28%" },
-        { name: "阀门个数", value: "28%" },
+        { name: "产销差率", value: "12%" },
+        { name: "综合漏损率", value: "18%" },
+        { name: "管网维修及时率", value: "92%" },
+        { name: "管网总长度", value: "1180km" },
+        { name: "阀门个数", value: "2760" },
       ],
     };
   }

src/components/PineNet/indexRight.js

@@ -8,6 +8,7 @@ import PipelineMonitoring from "../Overview/PipelineMonitoring";
 import WornAnalyze from "./WornAnalyze";
 import DrainWaterPine from "./DrainWaterPine";
 import PineKindChart from "./PineKindChart";
+import NetworkOfDrains from "./NetworkOfDrains";
 
 class index extends PureComponent {
   constructor(props) {
@@ -19,7 +20,7 @@ class index extends PureComponent {
       <div>
         <RightPage>
           <ChartBox title="当月排水管网监测" style={{ flex: 1 }}>
-            <PipelineMonitoring />
+            <NetworkOfDrains />
           </ChartBox>
           <ChartBox
             title="排水管网种类统计"

src/components/PumpStation/OpsStatistics.js

@@ -18,7 +18,7 @@ class OpsStatistics extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [80, 100],
         // 对其方式
         align: ["center"],
         // 表行数
@@ -34,20 +34,20 @@ class OpsStatistics extends PureComponent {
       data: [
         [
           "日常巡检",
-          "2023-03-01",
+          "2023-04-15",
           "泵站小组",
           "<span style='color:#0af250;'>进行中</span>",
           ">>",
         ],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-14", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-12", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-25", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-27", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-30", "泵站小组", "已完成", ">>"],
+        ["日常巡检", "2023-03-29", "泵站小组", "已完成", ">>"],
         [
-          "日常巡检",
-          "2023-03-01",
+          "应急检修",
+          "2023-04-16",
           "泵站小组",
           "<span style='color:#0af250;'>进行中</span>",
           ">>",
@@ -55,12 +55,12 @@ class OpsStatistics extends PureComponent {
         ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
         [
           "日常巡检",
-          "2023-03-01",
+          "2023-04-13",
           "泵站小组",
           "<span style='color:#0af250;'>进行中</span>",
           ">>",
         ],
-        ["日常巡检", "2023-03-01", "泵站小组", "已完成", ">>"],
+        ["抢险", "2023-03-22", "泵站小组", "已完成", ">>"],
       ],
     };
     const config = {

src/components/PumpStation/PumpGeneral.js

@@ -18,11 +18,11 @@ class PumpGeneral extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [120, 70, 90, 80],
         // 对其方式
         align: ["center"],
         // 表行数
-        rowNum: 6,
+        rowNum: 5,
       },
     };
   }
@@ -30,19 +30,19 @@ class PumpGeneral extends PureComponent {
   render() {
     const { height } = this.props;
     const data = {
-      header: ["泵站名称", "运行状态", "流量(m3/h)", "能耗（kWh）", "溢流风险"],
+      header: ["泵站名称", "运行状态", "流量", "能耗", "溢流风险"],
       data: [
-        ["***泵站 ", "<div style>", "75", "2.0", 1],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
-        ["管网维修及时率 ", "%", "75", "2.0", "-1"],
+        ["凤凰路一级泵站", "正常", "500m3/h", "1.2kWh", ""],
+        [
+          "凤凰路二级泵站 ",
+          "正常",
+          "600m3/h",
+          "1.5kWh",
+          "<span style='color:#f20a0a;'>!!!</span>",
+        ],
+        ["凤凰路三级泵站 ", "正常", "300m3/h", "0.7kWh", ""],
+        ["大涧沟雨水泵站 ", "正常", "500m3/h", "1.3kWh", ""],
+        ["改建纬十二路雨水泵站 ", "正常", "450m3/h", "0.9kWh", ""],
       ],
     };
     const config = {

src/components/PumpStation/WarnMessage.js

@@ -32,13 +32,13 @@ class WarnMessage extends PureComponent {
     const data = {
       header: ["报警内容", "泵站名称", "报警时间", "处理人员"],
       data: [
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
+        ["水质COD超标", "凤凰路一级泵站", "2023-02-18", "张强"],
+        ["氨氮超标", "凤凰路一级泵站", "2023-02-15", "王君泽"],
+        ["5号阀门故障", "大涧沟雨水泵站", "2023-02-15", "赵凯"],
+        ["总磷超标", "改建纬十二路雨水泵站", "2023-02-22", "王磊"],
+        ["7号水泵失联", "大涧沟雨水泵站", "2023-02-25", "李哲"],
+        ["3号水泵故障", "凤凰路二级泵站", "2023-02-22", "黎泽远"],
+        ["水质COD超标", "改建纬十二路雨水泵站", "2023-02-18", "闫江"],
       ],
     };
     const config = {

src/components/PumpStation/indexLeft.js

@@ -22,12 +22,12 @@ class index extends PureComponent {
         },
         {
           name: "已完成",
-          value: 78,
+          value: 70,
           color: "#9545cf",
         },
         {
           name: "待执行",
-          value: 78,
+          value: 8,
           color: "#d7b728",
         },
       ],
@@ -35,48 +35,48 @@ class index extends PureComponent {
         {
           key: "1",
           type: "日常巡检",
-          tiem: "2023-03-01",
+          tiem: "2023-03-12",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "2",
           type: "日常巡检",
-          tiem: "2023-03-01",
+          tiem: "2023-03-15",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "3",
           type: "日常巡检",
-          tiem: "2023-03-01",
+          tiem: "2023-03-16",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "4",
-          type: "日常巡检",
-          tiem: "2023-03-01",
+          type: "应急检修",
+          tiem: "2023-03-17",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "5",
           type: "日常巡检",
-          tiem: "2023-03-01",
+          tiem: "2023-03-20",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "6",
           type: "日常巡检",
-          tiem: "2023-03-01",
+          tiem: "2023-03-22",
           dep: "泵站小组",
           status: "进行中",
         },
         {
           key: "7",
-          type: "日常巡检",
+          type: "抢险",
           tiem: "2023-03-01",
           dep: "泵站小组",
           status: "进行中",

src/components/Sewage/EnergyConsumption.js

@@ -10,10 +10,10 @@ class EnergyConsumption extends PureComponent {
     };
   }
   getOptions() {
-    function generateNumbers() {
+    function generateNumbers(num) {
       var numbers = [];
       for (var i = 0; i < 30; i++) {
-        numbers.push(Math.floor(Math.random() * 100));
+        numbers.push(num + 0.2 + Math.floor(Math.random() * 10) / 100);
       }
       return numbers;
     }
@@ -96,36 +96,36 @@ class EnergyConsumption extends PureComponent {
       },
       series: [
         {
-          data: generateNumbers(),
-          name: "第一水厂",
+          data: generateNumbers(0.9),
+          name: "平阴区污水处理厂",
           type: "line",
           smooth: true,
           symbol: "none",
         },
         {
-          data: generateNumbers(),
-          name: "第二水厂",
+          data: generateNumbers(1.4),
+          name: "美洁污水处理厂",
           type: "line",
           smooth: true,
           symbol: "none",
         },
         {
-          data: generateNumbers(),
-          name: "第三水厂",
+          data: generateNumbers(0.8),
+          name: "光大水务一厂",
           type: "line",
           smooth: true,
           symbol: "none",
         },
         {
-          data: generateNumbers(),
-          name: "第四水厂",
+          data: generateNumbers(0.9),
+          name: "章丘污水处理厂",
           type: "line",
           smooth: true,
           symbol: "none",
         },
         {
-          data: generateNumbers(),
-          name: "第五水厂",
+          data: generateNumbers(1.3),
+          name: "济南西区污水处理厂",
           type: "line",
           smooth: true,
           symbol: "none",

src/components/Sewage/UserWaterUsage.js

@@ -18,7 +18,7 @@ class UserWaterUsage extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [100, 200],
         // 对其方式
         align: ["center"],
         // 表行数
@@ -26,23 +26,19 @@ class UserWaterUsage extends PureComponent {
       },
     };
   }
-
   render() {
     const { height } = this.props;
     const data = {
       header: ["排名", "水厂名称", "分数（分）"],
       data: [
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
+        ["NO.1", "高新区水质净化一厂", "98"],
+        ["NO.2", "济南西区污水处理厂", "97"],
+        ["NO.3", "平阴区污水处理厂", "97.8"],
+        ["NO.4", "光大水务二厂", "97.3"],
+        ["NO.5", "济南清区污水处理厂", "95.5"],
+        ["NO.6", "光大水务一厂", "95"],
+        ["NO.7", "章丘污水处理厂", "93"],
+        ["NO.8", "美洁污水处理厂", "94.7"],
       ],
     };
     const config = {

src/components/Sewage/WaterQuality.js

@@ -18,11 +18,11 @@ class UserWaterUsage extends PureComponent {
         // 行号表头
         // indexHeader: '序号',
         // 宽度
-        // columnWidth: [50, 100, 200],
+        columnWidth: [150, 100, 100],
         // 对其方式
         align: ["center"],
         // 表行数
-        rowNum: 8,
+        rowNum: 6,
       },
     };
   }
@@ -32,24 +32,14 @@ class UserWaterUsage extends PureComponent {
     const data = {
       header: ["水厂名称", "进厂COD", "进厂氨氮", "进厂pH"],
       data: [
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["平阴区污水处理厂", "511mg/L", "41mg/L", "7.8"],
+        ["美洁污水处理厂", "457mg/L", "36mg/L", "7.4"],
+        ["济南西区污水处理厂", "387mg/L", "25mg/L", "8.1"],
+        ["章丘污水处理厂", "535mg/L", "38mg/L", "8.7"],
+        ["高新区水质净化一厂", "523mg/L", "36mg/L", "7.9"],
+        ["济南清区污水处理厂", "376mg/L", "23mg/L", "7.3"],
+        ["光大水务一厂", "514mg/L", "48mg/L", "7.6"],
+        ["光大水务二厂", "468mg/L", "40mg/L", "8.2"],
       ],
     };
     const config = {

src/components/Sewage/index.js

@@ -33,7 +33,7 @@ class index extends PureComponent {
         </LeftPage>
         <BMap
           actives={[
-            ShowIconType.WaterWorks,
+            ShowIconType.SewageWorks,
             ShowIconType.Pump,
             ShowIconType.BigUserCompany,
             ShowIconType.All,

src/components/WaterSupply/EnergyConsumption.js

@@ -0,0 +1,156 @@
+// 当月各个水厂耗能
+import React, { PureComponent } from "react";
+import Chart from "../../utils/chart";
+
+class EnergyConsumption extends PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      renderer: "canvas",
+    };
+  }
+  getOptions() {
+    function generateNumbers(num) {
+      var numbers = [];
+      for (var i = 0; i < 30; i++) {
+        numbers.push(num + 0.2 + Math.floor(Math.random() * 10) / 100);
+      }
+      return numbers;
+    }
+    return {
+      // color: ["#3C4FD6", "#F6AC4B"],
+      xAxis: {
+        type: "category",
+        data: [
+          "1日",
+          "2日",
+          "3日",
+          "4日",
+          "5日",
+          "6日",
+          "7日",
+          "8日",
+          "9日",
+          "10日",
+          "11日",
+          "12日",
+          "13日",
+          "14日",
+          "15日",
+          "16日",
+          "17日",
+          "18日",
+          "19日",
+          "20日",
+          "21日",
+          "22日",
+          "23日",
+          "24日",
+          "25日",
+          "26日",
+          "27日",
+          "28日",
+          "29日",
+          "30日",
+        ],
+        axisLabel: {
+          textStyle: {
+            color: "#fff",
+            fontSize: 14,
+          },
+        },
+        axisLine: {
+          lineStyle: {
+            color: "#fff",
+          },
+        },
+      },
+      grid: {
+        top: 60,
+        left: 10,
+        right: 10,
+        bottom: 10,
+        containLabel: true,
+      },
+      yAxis: {
+        type: "value",
+        name: "能耗（kWh）",
+        axisLabel: {
+          textStyle: {
+            color: "#fff",
+            fontSize: 14,
+          },
+        },
+        axisLine: {
+          lineStyle: {
+            color: "#fff",
+          },
+        },
+        splitLine: {
+          show: false,
+        },
+      },
+      grid: {
+        bottom: 30,
+        right: 20,
+      },
+      series: [
+        {
+          data: generateNumbers(0.8),
+          name: "鹊华水厂",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+        },
+        {
+          data: generateNumbers(1.2),
+          name: "玉清水厂",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+        },
+        {
+          data: generateNumbers(0.5),
+          name: "南郊水厂",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+        },
+        {
+          data: generateNumbers(0.75),
+          name: "东郊水厂",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+        },
+        {
+          data: generateNumbers(1),
+          name: "青龙山水厂",
+          type: "line",
+          smooth: true,
+          symbol: "none",
+        },
+      ],
+      legend: {
+        show: true,
+        textStyle: {
+          color: "#fff",
+        },
+      },
+    };
+  }
+  render() {
+    return (
+      <div
+        style={{
+          width: "100%",
+          height: "100%",
+        }}
+      >
+        <Chart option={this.getOptions()} />
+      </div>
+    );
+  } //endrender
+}
+
+export default EnergyConsumption;

src/components/WaterSupply/UserWaterUsage.js

@@ -26,23 +26,19 @@ class UserWaterUsage extends PureComponent {
       },
     };
   }
-
   render() {
     const { height } = this.props;
     const data = {
       header: ["排名", "水厂名称", "分数（分）"],
       data: [
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
-        ["NO.1", "第一水厂", "75"],
+        ["NO.1", "南郊水厂", "98"],
+        ["NO.2", "玉清水厂", "97"],
+        ["NO.3", "白龙泉水厂", "97"],
+        ["NO.4", "大禹王水厂", "96.5"],
+        ["NO.5", "东郊水厂", "96"],
+        ["NO.6", "鹊华水厂", "95"],
+        ["NO.7", "水帘峡山泉水厂", "93"],
+        ["NO.8", "青龙山水厂", "91"],
       ],
     };
     const config = {

src/components/WaterSupply/WaterVolume.js

@@ -39,7 +39,7 @@ class WaterVolume extends PureComponent {
       yAxis: {
         type: "category",
         name: "（万m3）",
-        data: ["第一水厂", "第二水厂", "第三水厂", "第四水厂", "第五水厂"],
+        data: ["鹊华水厂", "玉清水厂", "南郊水厂", "东郊水厂", "青龙山水厂"],
         inverse: true,
         axisLabel: {
           textStyle: {
@@ -58,7 +58,7 @@ class WaterVolume extends PureComponent {
           realtimeSort: true,
           name: "产水量",
           type: "bar",
-          data: [100, 120, 30, 40, 50],
+          data: [30, 20, 40, 30, 15],
           label: {
             show: true,
             position: "right",
@@ -69,7 +69,7 @@ class WaterVolume extends PureComponent {
           realtimeSort: true,
           name: "销水量",
           type: "bar",
-          data: [100, 120, 30, 40, 50],
+          data: [27, 18, 38, 27, 13],
           label: {
             show: true,
             position: "right",

src/components/WaterSupply/index.js

@@ -3,7 +3,7 @@ import React, { PureComponent } from "react";
 import { LeftPage } from "./style";
 import ChartBox from "../ChartBox";
 import UserWaterUsage from "./UserWaterUsage";
-import EnergyConsumption from "../Sewage/EnergyConsumption";
+import EnergyConsumption from "./EnergyConsumption";
 import WaterVolume from "./WaterVolume";
 import BMap from "../centerPage/charts/BMap";
 import { ShowIconType } from "../Map/MockData";

src/components/centerPage/charts/BMap.js

@@ -1,12 +1,16 @@
 import React, { PureComponent } from "react";
-import { Map, Marker } from "react-bmapgl";
-
+import { Map, DrawingManager } from "react-bmapgl";
 import { styleJson } from "./BMapConfig";
 import styled from "styled-components";
 import Project, { IconType } from "../../Map/Project";
 import ArrowPolyline from "../../Map/ArrowPolyline";
-import MockData, { PipeData, ShowIconType } from "../../Map/MockData";
+import MockData, {
+  PipeData,
+  ShowIconType,
+  WaterWorks,
+} from "../../Map/MockData";
 import Legend from "../../Map/Legend";
+import DrawDom from "./DrawDom";
 const { BMapGL, BMapGLLib } = window;
 
 class BMap extends PureComponent {
@@ -22,7 +26,7 @@ class BMap extends PureComponent {
       data: this.initData(),
     };
     this.randomParams = this.randomParams.bind(this);
-    // this.draw = this.draw.bind(this);
+    this.draw = this.draw.bind(this);
   }
   map = null;
   lushu = null;
@@ -59,9 +63,22 @@ class BMap extends PureComponent {
     //   rectangleOptions: styleOptions, // 矩形的样式
     //   labelOptions: labelOptions, // label样式
     // });
+    // this.drawingManager.addEventListener(
+    //   "polylinecomplete",
+    //   this.polylinecomplete
+    // );
+  }
+  polylinecomplete(e, overlay) {
+    console.log(e.getPath().length);
+    var points_poly = [];
+    for (var i = 0; i < e.getPath().length; i++) {
+      points_poly.push({ lng: e.getPath()[i].lng, lat: e.getPath()[i].lat });
+    }
+    console.log(JSON.stringify(points_poly));
   }
 
   draw(e) {
+    console.log(this.drawingManager);
     var drawingType = e;
     // 进行绘制
     if (
@@ -92,7 +109,8 @@ class BMap extends PureComponent {
 
   showIcon(type) {
     const { active } = this.state;
-    if (active == -1 || active == type) return true;
+
+    if (active == ShowIconType.All || active == type) return true;
     return false;
   }
 
@@ -108,6 +126,13 @@ class BMap extends PureComponent {
     );
     if (actives?.findIndex((item) => item == ShowIconType.PipeNet) !== -1)
       return [...PipeData, ...list];
+
+    //供水页面只展示供水厂   污水页面只展示污水厂
+    if (actives?.findIndex((item) => item == ShowIconType.SupplyWorks) !== -1)
+      return [...WaterWorks[1], ...list];
+    if (actives?.findIndex((item) => item == ShowIconType.SewageWorks) !== -1)
+      return [...WaterWorks[0], ...list];
+
     return list;
   }
 
@@ -123,8 +148,8 @@ class BMap extends PureComponent {
             width: "100%",
             height: "100%",
           }}
-          center={new BMapGL.Point(116.402544, 39.928216)} //{ lng: 116.402544, lat: 39.928216 }
-          minZoom={12}
+          center={new BMapGL.Point(117.124099, 36.659565)} //{ lng: 116.402544, lat: 39.928216 }
+          minZoom={14}
           zoom={11}
           mapStyleV2={{
             styleJson,
@@ -160,7 +185,7 @@ class BMap extends PureComponent {
                 return (
                   <Project
                     key={`${item}_${index}`}
-                    title={item.name}
+                    title={item.current ? item.current : item.name}
                     position={item.position}
                     data={item.data}
                     icon={cur.icon}
@@ -171,7 +196,7 @@ class BMap extends PureComponent {
             );
           })}
         </Map>
-
+        {/* <DrawDom draw={this.draw} /> */}
         <Legend
           list={[...data, { type: -1, name: "全部" }]}
           active={active}

src/services/index.js

@@ -1,4 +1,5 @@
 import request from "../utils/request";
+import moment from "moment";
 
 // 获取左侧界面数据请求
 export const getLeftPageData = async () => {
@@ -37,6 +38,14 @@ export const getLeftPageData = async () => {
   };
 };
 
+function dayOfYear() {
+  const date = moment(new Date()).format("YYYY-MM-DD");
+  let [year, month, day] = date.split("-");
+  let day1 = new Date(year, 0);
+  let day2 = new Date(year, month - 1, day);
+  return ((day2 - day1) / (1000 * 60 * 60 * 24) + 1) * 75;
+}
+
 // 获取中间界面数据请求
 export const getCenterPageData = async () => {
   // return request("/api/centerPageData").then((response) => {
@@ -46,32 +55,32 @@ export const getCenterPageData = async () => {
     detailsList: [
       {
         title: "水厂产水总量",
-        number: 99733.68,
-        unit: "m³",
+        number: dayOfYear(),
+        unit: "万m³",
       },
       {
         title: "城市供水用水总量",
-        number: 97654.34,
-        unit: "m³",
+        number: dayOfYear() * 0.93,
+        unit: "万m³",
       },
       {
         title: "城市污水处理总量",
-        number: 2300,
-        unit: "万元",
+        number: dayOfYear() * 0.79,
+        unit: "万m³",
       },
       {
         title: "管网长度",
-        number: 125,
+        number: 993,
         unit: "km",
       },
       {
         title: "泵站数量",
-        number: 117294,
+        number: 102,
         unit: "座",
       },
       {
         title: "防汛事件",
-        number: 87853.73,
+        number: 13,
         unit: "件",
       },
     ],

yarn.lock

@@ -2708,7 +2708,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-antd@4.24.8:
+antd@4:
   version "4.24.8"
   resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.8.tgz#22f34de6857556868780dfa5fe7b374b0b71b517"
   integrity sha512-wrNy2Hi27uM3948okG3n2GwzQKBFUn1Qn5mn2I/ALcR28rC6cTjHYOuA248Zl9ECzz3jo4TY2R0SIa+5GZ/zGA==
@@ -3263,13 +3263,6 @@ babel-plugin-dynamic-import-node-sync@^2.0.1:
   dependencies:
     "@babel/plugin-syntax-dynamic-import" "^7.0.0-beta.39"
 
-babel-plugin-import@^1.13.6:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.6.tgz#4ff2aa3b9759e6a4458ce59890da3684fe3dda9d"
-  integrity sha512-N7FYnGh0DFsvDRkAPsvFq/metVfVD7P2h1rokOPpEH4cZbdRHCW+2jbXt0nnuqowkm/xhh2ww1anIdEpfYa7ZA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-
 babel-plugin-istanbul@^4.1.4, babel-plugin-istanbul@^4.1.5:
   version "4.1.6"
   resolved "https://registry.npmmirror.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
@@ -3310,7 +3303,7 @@ babel-plugin-react-require@3.0.0:
   resolved "https://registry.npmmirror.com/babel-plugin-react-require/-/babel-plugin-react-require-3.0.0.tgz#2e4e7b4496b93a654a1c80042276de4e4eeb20e3"
   integrity sha512-mZV3ycvtB4mfVhmScbU4CjMfBgoQAlsGu/vQw292juPSgvezTmBAke+V85ODAVNCM68r2Qa6dwu72Zcl4cTIbw==
 
-"babel-plugin-styled-components@>= 1.12.0", babel-plugin-styled-components@^2.0.7:
+"babel-plugin-styled-components@>= 1.12.0":
   version "2.0.7"
   resolved "https://registry.npmmirror.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086"
   integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==
@@ -9119,7 +9112,7 @@ mixin-deep@^1.2.0:
   dependencies:
     minimist "^1.2.6"
 
-moment@^2.24.0, moment@^2.29.2:
+moment@^2.24.0, moment@^2.29.2, moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==