Startsida Utforska Hjälp
Registrera dig Logga in
xujunjie
/
BigScreen
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

修改bug

Renxy 2 år sedan
förälder
5ffd4d5471
incheckning
4254ad22aa
4 ändrade filer med 87 tillägg och 89 borttagningar
Delad Vy Visa Diff Statistik
  1. 56 59
      public/index.html
  2. 1 1
      src/components/Map/Legend.js
  3. 3 2
      src/components/centerPage/charts/BMap.js
  4. 27 27
      src/components/topPage/index.jsx

+ 56 - 59
public/index.html
Visa fil 

@@ -1,75 +1,72 @@
 
 <!DOCTYPE html>
 
 <html lang="en">
 
-  <head>
 
-    <meta charset="UTF-8" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <title>React 大数据可视化</title>
 
-    <link rel="stylesheet" href="index.css" />
 
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 
-    <link
 
-      href="//mapopen.bj.bcebos.com/github/BMapGLLib/DrawingManager/src/DrawingManager.min.css"
 
-      rel="stylesheet"
 
-    />
 
-    <!-- <script
 
+
 
+<head>
 
+  <meta charset="UTF-8" />
 
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
 
+  <title>市政智慧水务管理平台</title>
 
+  <link rel="stylesheet" href="index.css" />
 
+  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 
+  <link href="//mapopen.bj.bcebos.com/github/BMapGLLib/DrawingManager/src/DrawingManager.min.css" rel="stylesheet" />
 
+  <!-- <script
 
       type="text/javascript"
 
       src="http://api.map.baidu.com/api?v=2.0&ak=ILQH1WYMHbSlqFNViqca6j62Ga7bSOzW"
 
     ></script> -->
 
-    <script
 
-      type="text/javascript"
 
-      src="//api.map.baidu.com/api?type=webgl&v=2.0&ak=ILQH1WYMHbSlqFNViqca6j62Ga7bSOzW"
 
-    ></script>
 
-    <script type="text/javascript" src="Lushu.js"></script>
 
-    <!-- <script
 
+  <script type="text/javascript"
 
+    src="//api.map.baidu.com/api?type=webgl&v=2.0&ak=ILQH1WYMHbSlqFNViqca6j62Ga7bSOzW"></script>
 
+  <script type="text/javascript" src="Lushu.js"></script>
 
+  <!-- <script
 
       type="text/javascript"
 
       src="//api.map.baidu.com/library/LuShu/gl/src/LuShu_min.js"
 
     ></script> -->
 
-    <script src="//mapopen.bj.bcebos.com/github/BMapGLLib/DrawingManager/src/DrawingManager.min.js"></script>
 
-  </head>
 
+  <script src="//mapopen.bj.bcebos.com/github/BMapGLLib/DrawingManager/src/DrawingManager.min.js"></script>
 
+</head>
 
+
 
+<body>
 
+  <div id="root"></div>
 
+  <script src="index.js"></script>
 
+</body>
 
 
-  <body>
 
-    <div id="root"></div>
 
-    <script src="index.js"></script>
 
-  </body>
 
+<style>
 
+  .drawing-panel {
 
+    z-index: 999;
 
+    position: absolute;
 
+    top: 0.5rem;
 
+    margin-left: 0.5rem;
 
+    padding-left: 0;
 
+    border-radius: 0.25rem;
 
+    height: 47px;
 
+    box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
 
+  }
 
 
-  <style>
 
-    .drawing-panel {
 
-      z-index: 999;
 
-      position: absolute;
 
-      top: 0.5rem;
 
-      margin-left: 0.5rem;
 
-      padding-left: 0;
 
-      border-radius: 0.25rem;
 
-      height: 47px;
 
-      box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
 
-    }
 
+  .bmap-btn {
 
+    border-right: 1px solid #d2d2d2;
 
+    float: left;
 
+    width: 64px;
 
+    height: 100%;
 
+    background-image: url(//api.map.baidu.com/library/DrawingManager/1.4/src/bg_drawing_tool.png);
 
+    cursor: pointer;
 
+  }
 
 
-    .bmap-btn {
 
-      border-right: 1px solid #d2d2d2;
 
-      float: left;
 
-      width: 64px;
 
-      height: 100%;
 
-      background-image: url(//api.map.baidu.com/library/DrawingManager/1.4/src/bg_drawing_tool.png);
 
-      cursor: pointer;
 
-    }
 
+  .drawing-panel .bmap-marker {
 
+    background-position: -65px 0;
 
+  }
 
 
-    .drawing-panel .bmap-marker {
 
-      background-position: -65px 0;
 
-    }
 
+  .drawing-panel .bmap-polyline {
 
+    background-position: -195px 0;
 
+  }
 
 
-    .drawing-panel .bmap-polyline {
 
-      background-position: -195px 0;
 
-    }
 
+  .drawing-panel .bmap-rectangle {
 
+    background-position: -325px 0;
 
+  }
 
 
-    .drawing-panel .bmap-rectangle {
 
-      background-position: -325px 0;
 
-    }
 
+  .drawing-panel .bmap-polygon {
 
+    background-position: -260px 0;
 
+  }
 
 
-    .drawing-panel .bmap-polygon {
 
-      background-position: -260px 0;
 
-    }
 
+  .drawing-panel .bmap-circle {
 
+    background-position: -130px 0;
 
+  }
 
+</style>
 
 
-    .drawing-panel .bmap-circle {
 
-      background-position: -130px 0;
 
-    }
 
-  </style>
 
-</html>
 
+</html>

+ 1 - 1
src/components/Map/Legend.js
Visa fil 

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

+ 3 - 2
src/components/centerPage/charts/BMap.js
Visa fil 

@@ -98,14 +98,15 @@ class BMap extends PureComponent {
 
 
   initData() {
 
     const { actives } = this.props;
 
+    if (!actives) return MockData;
 
     //如果显示中有管网需要把官网去掉，然后增加供水管网和排水官网按钮
 
     const list = MockData.filter(
 
       (item) =>
 
-        this.props.actives.findIndex(
 
+        this.props.actives?.findIndex(
 
           (cur) => cur == item.type && cur != ShowIconType.PipeNet
 
         ) !== -1
 
     );
 
-    if (actives.findIndex((item) => item == ShowIconType.PipeNet) !== -1)
 
+    if (actives?.findIndex((item) => item == ShowIconType.PipeNet) !== -1)
 
       return [...PipeData, ...list];
 
     return list;
 
   }

+ 27 - 27
src/components/topPage/index.jsx
Visa fil 

@@ -1,27 +1,27 @@
 
-import React, { PureComponent, Fragment } from 'react';
 
-import { formatTime } from '../../utils';
 
+import React, { PureComponent, Fragment } from "react";
 
+import { formatTime } from "../../utils";
 
 import {
 
   Decoration10,
 
   Decoration8,
 
   Decoration6,
 
-} from '@jiaminghi/data-view-react';
 
+} from "@jiaminghi/data-view-react";
 
 
-import { TopBox, TimeBox } from './style';
 
+import { TopBox, TimeBox } from "./style";
 
 
 class index extends PureComponent {
 
   constructor(props) {
 
     super(props);
 
     this.state = {
 
-      title: '大数据可视化平台',
 
-      timeStr: '',
 
+      title: "市政智慧水务管理平台",
 
+      timeStr: "",
 
       weekday: [
 
-        '星期天',
 
-        '星期一',
 
-        '星期二',
 
-        '星期三',
 
-        '星期四',
 
-        '星期五',
 
-        '星期六',
 
+        "星期天",
 
+        "星期一",
 
+        "星期二",
 
+        "星期三",
 
+        "星期四",
 
+        "星期五",
 
+        "星期六",
 
       ],
 
     };
 
   }
 
@@ -33,8 +33,8 @@ class index extends PureComponent {
 
 
   setTimingFn() {
 
     this.timing = setInterval(() => {
 
-      let dateYear = formatTime(new Date(), 'yyyy-MM-dd');
 
-      let dateDay = formatTime(new Date(), 'HH: mm: ss');
 
+      let dateYear = formatTime(new Date(), "yyyy-MM-dd");
 
+      let dateDay = formatTime(new Date(), "HH: mm: ss");
 
       let dateWeek = this.state.weekday[new Date().getDay()];
 
       this.setState({
 
         timeStr: `${dateYear} | ${dateDay} ${dateWeek}`,
 
@@ -47,29 +47,29 @@ class index extends PureComponent {
 
     return (
 
       <Fragment>
 
         <TopBox>
 
-          <div className='top_box'>
 
-            <Decoration10 className='top_decoration10' />
 
-            <div className='title-box'>
 
+          <div className="top_box">
 
+            <Decoration10 className="top_decoration10" />
 
+            <div className="title-box">
 
               <Decoration8
 
-                className='top_decoration8'
 
-                color={['#568aea', '#000000']}
 
+                className="top_decoration8"
 
+                color={["#568aea", "#000000"]}
 
               />
 
-              <div className='title'>
 
-                <span className='title-text'>{title}</span>
 
+              <div className="title">
 
+                <span className="title-text">{title}</span>
 
                 <Decoration6
 
-                  className='title-bototm top_decoration6'
 
+                  className="title-bototm top_decoration6"
 
                   reverse={true}
 
-                  color={['#50e3c2', '#67a1e5']}
 
+                  color={["#50e3c2", "#67a1e5"]}
 
                 />
 
               </div>
 
 
               <Decoration8
 
                 reverse={true}
 
-                className='top_decoration8'
 
-                color={['#568aea', '#000000']}
 
+                className="top_decoration8"
 
+                color={["#568aea", "#000000"]}
 
               />
 
             </div>
 
-            <Decoration10 className='top_decoration10 top_decoration10_reverse' />
 
+            <Decoration10 className="top_decoration10 top_decoration10_reverse" />
 
             <TimeBox>
 
               <h3>{this.state.timeStr}</h3>
 
             </TimeBox>