人员数据

src/components/Map/MockData.js

@@ -646,6 +646,77 @@ export default [
           { lng: 117.00351, lat: 36.658266 },
         ],
       },
+      {
+        name: "张嘉钰",
+        position: { lng: 116.98183972069246, lat: 36.63862555710255 },
+        data: [
+          {
+            name: "部门",
+            value: "泵站运维",
+          },
+          {
+            name: "所在区域",
+            value: "市中区",
+          },
+          {
+            name: "电话",
+            value: "15119990923",
+          },
+        ],
+        points: [
+          { lng: 116.96670033895006, lat: 36.63654574863114 },
+          { lng: 116.96687237737896, lat: 36.63839447006922 },
+          { lng: 116.97621979868202, lat: 36.638163382336685 },
+          { lng: 116.98183972069246, lat: 36.63862555710255 },
+        ],
+      },
+      {
+        name: "张振",
+        position: { lng: 117.04232059606979, lat: 36.67957675990868 },
+        data: [
+          {
+            name: "部门",
+            value: "泵站运维",
+          },
+          {
+            name: "所在区域",
+            value: "市中区",
+          },
+          {
+            name: "电话",
+            value: "15219990923",
+          },
+        ],
+        points: [
+          { lng: 117.03688109962667, lat: 36.677692915313294 },
+          { lng: 117.0368899617556, lat: 36.678792260417296 },
+          { lng: 117.03979125744182, lat: 36.67913384727424 },
+          { lng: 117.04232059606979, lat: 36.67957675990868 },
+        ],
+      },
+      {
+        name: "林平之",
+        position: { lng: 117.04026740758265, lat: 36.631065001661796 },
+        data: [
+          {
+            name: "部门",
+            value: "官网运维",
+          },
+          {
+            name: "所在区域",
+            value: "市中区",
+          },
+          {
+            name: "电话",
+            value: "13118529999",
+          },
+        ],
+        points: [
+          { lng: 117.03698246730612, lat: 36.62554757518824 },
+          { lng: 117.03982024293765, lat: 36.62884698866059 },
+          { lng: 117.04026740758265, lat: 36.631065001661796 },
+        ],
+      },
     ],
   },
   {
@@ -655,7 +726,7 @@ export default [
     data: [
       {
         name: "抢修车01",
-        position: { lng: 116.937237, lat: 36.649659 },
+        position: { lng: 116.9420801073371, lat: 36.65226259102834 },
         data: [
           {
             name: "所在区域",
@@ -671,10 +742,79 @@ export default [
           },
         ],
         points: [
-          { lng: 116.93421, lat: 36.64967 },
-          { lng: 116.936698, lat: 36.649945 },
-          { lng: 116.937246, lat: 36.650133 },
-          { lng: 116.937237, lat: 36.649659 },
+          { lng: 116.94793452077774, lat: 36.65220575436219 },
+          { lng: 116.94471341780036, lat: 36.65345615124216 },
+          { lng: 116.9420801073371, lat: 36.65226259102834 },
+        ],
+      },
+      {
+        name: "抢修车02",
+        position: { lng: 117.05200048902859, lat: 36.61622455310222 },
+        data: [
+          {
+            name: "所在区域",
+            value: "安澜北路",
+          },
+          {
+            name: "负责人",
+            value: "刘军",
+          },
+          {
+            name: "电话",
+            value: "13564822451",
+          },
+        ],
+        points: [
+          { lng: 117.04710900773479, lat: 36.613009916485964 },
+          { lng: 117.0488363625151, lat: 36.6142072868144 },
+          { lng: 117.0505637172954, lat: 36.61502721437244 },
+          { lng: 117.05200048902859, lat: 36.61622455310222 },
+        ],
+      },
+      {
+        name: "抢修车03",
+        position: { lng: 117.11963746043857, lat: 36.66069383433423 },
+        data: [
+          {
+            name: "所在区域",
+            value: "安澜北路",
+          },
+          {
+            name: "负责人",
+            value: "许建军",
+          },
+          {
+            name: "电话",
+            value: "13725454659",
+          },
+        ],
+        points: [
+          { lng: 117.12995002871826, lat: 36.656304748210815 },
+          { lng: 117.12982527990842, lat: 36.66059332373565 },
+          { lng: 117.11963746043857, lat: 36.66069383433423 },
+        ],
+      },
+      {
+        name: "抢修车04",
+        position: { lng: 117.11359658614936, lat: 36.636923886286866 },
+        data: [
+          {
+            name: "所在区域",
+            value: "安澜北路",
+          },
+          {
+            name: "负责人",
+            value: "赵云海",
+          },
+          {
+            name: "电话",
+            value: "18774658888",
+          },
+        ],
+        points: [
+          { lng: 117.09897499014951, lat: 36.63628321947181 },
+          { lng: 117.10239552825821, lat: 36.63748689208199 },
+          { lng: 117.11359658614936, lat: 36.636923886286866 },
         ],
       },
     ],

src/components/centerPage/charts/BMap.js

@@ -36,38 +36,38 @@ class BMap extends PureComponent {
 
   componentDidMount() {
     // this.initData();
-    // var styleOptions = {
-    //   strokeColor: "#5E87DB", // 边线颜色
-    //   fillColor: "#5E87DB", // 填充颜色。当参数为空时，圆形没有填充颜色
-    //   strokeWeight: 2, // 边线宽度，以像素为单位
-    //   strokeOpacity: 1, // 边线透明度，取值范围0-1
-    //   fillOpacity: 0.2, // 填充透明度，取值范围0-1
-    // };
-    // var labelOptions = {
-    //   borderRadius: "2px",
-    //   background: "#FFFBCC",
-    //   border: "1px solid #E1E1E1",
-    //   color: "#703A04",
-    //   fontSize: "12px",
-    //   letterSpacing: "0",
-    //   padding: "5px",
-    // };
-    // // 实例化鼠标绘制工具
-    // this.drawingManager = new BMapGLLib.DrawingManager(this.map, {
-    //   // isOpen: true, // 是否开启绘制模式
-    //   enableCalculate: false, // 绘制是否进行测距测面
-    //   enableSorption: true, // 是否开启边界吸附功能
-    //   sorptiondistance: 20, // 边界吸附距离
-    //   circleOptions: styleOptions, // 圆的样式
-    //   polylineOptions: styleOptions, // 线的样式
-    //   polygonOptions: styleOptions, // 多边形的样式
-    //   rectangleOptions: styleOptions, // 矩形的样式
-    //   labelOptions: labelOptions, // label样式
-    // });
-    // this.drawingManager.addEventListener(
-    //   "polylinecomplete",
-    //   this.polylinecomplete
-    // );
+    var styleOptions = {
+      strokeColor: "#5E87DB", // 边线颜色
+      fillColor: "#5E87DB", // 填充颜色。当参数为空时，圆形没有填充颜色
+      strokeWeight: 2, // 边线宽度，以像素为单位
+      strokeOpacity: 1, // 边线透明度，取值范围0-1
+      fillOpacity: 0.2, // 填充透明度，取值范围0-1
+    };
+    var labelOptions = {
+      borderRadius: "2px",
+      background: "#FFFBCC",
+      border: "1px solid #E1E1E1",
+      color: "#703A04",
+      fontSize: "12px",
+      letterSpacing: "0",
+      padding: "5px",
+    };
+    // 实例化鼠标绘制工具
+    this.drawingManager = new BMapGLLib.DrawingManager(this.map, {
+      // isOpen: true, // 是否开启绘制模式
+      enableCalculate: false, // 绘制是否进行测距测面
+      enableSorption: true, // 是否开启边界吸附功能
+      sorptiondistance: 20, // 边界吸附距离
+      circleOptions: styleOptions, // 圆的样式
+      polylineOptions: styleOptions, // 线的样式
+      polygonOptions: styleOptions, // 多边形的样式
+      rectangleOptions: styleOptions, // 矩形的样式
+      labelOptions: labelOptions, // label样式
+    });
+    this.drawingManager.addEventListener(
+      "polylinecomplete",
+      this.polylinecomplete
+    );
   }
   polylinecomplete(e, overlay) {
     console.log(e.getPath().length);
@@ -148,6 +148,7 @@ class BMap extends PureComponent {
 
   render() {
     const { MockData, active, data } = this.state;
+    const { actives } = this.props;
     return (
       <BMapBox>
         <Map
@@ -159,7 +160,7 @@ class BMap extends PureComponent {
             height: "100%",
           }}
           center={new BMapGL.Point(117.124099, 36.659565)} //{ lng: 116.402544, lat: 39.928216 }
-          minZoom={14}
+          minZoom={10}
           zoom={11}
           mapStyleV2={{
             styleJson,
@@ -205,9 +206,14 @@ class BMap extends PureComponent {
               })
             );
           })}
-          {pipeTipData.map((item) => this.renderTip(item))}
+          {actives?.findIndex(
+            (item) =>
+              item == ShowIconType.InPipeNet ||
+              item == ShowIconType.OutPipeNet ||
+              item == ShowIconType.PipeNet
+          ) !== -1 && pipeTipData.map((item) => this.renderTip(item))}
         </Map>
-        {/* <DrawDom draw={this.draw} /> */}
+        <DrawDom draw={this.draw} />
         <Legend
           list={[...data, { type: -1, name: "全部" }]}
           active={active}