From 2774a2a278cb3fb660a02e827de0f5f98b640ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Fri, 29 Jul 2022 14:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/quanju/containers/example.js   |  6 ++++--
 .../quanju/containers/footer/conserve/index.js         |  2 --
 .../sections/quanju/containers/footer/conserve/left.js | 10 +++++-----
 .../quanju/containers/footer/conserve/right.js         | 10 +++++-----
 .../src/sections/quanju/containers/footer/gis/gis.js   | 10 +++++-----
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/example.js b/web/client/src/sections/quanju/containers/example.js
index 1beb1d5c..5a40535b 100644
--- a/web/client/src/sections/quanju/containers/example.js
+++ b/web/client/src/sections/quanju/containers/example.js
@@ -35,12 +35,14 @@ const Example = (props) => {
                     document.body.clientHeight / 1080
                 )})`, */
             }}>
-                <Gis />
+
                 <div style={{ width: "100%", height: "10%" }}>
                     <Header tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} />
                 </div>
-                <div style={{position: 'absolute', width: "100%", height: "90%" }}>
+                <div style={{ position: 'absolute', width: "100%", height: "90%" }}>
+                    <Gis />
                     <Footer tabKey={tabKey} dispatch={dispatch} />
+
                 </div>
 
             </div>
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js
index 7a141fe5..105995f2 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/index.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js
@@ -29,10 +29,8 @@ const Conserve = (props) => {
 
     return (
        <div style={{ width: '100%', height: '100%', }}>
-         <div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
             <Left roadData={roadData} loading={loading} />
             <Right highwaysData={highwaysData} roadMaintenances={roadMaintenances}/>
-        </div>
        </div>
     )
 }
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left.js b/web/client/src/sections/quanju/containers/footer/conserve/left.js
index 51b846e5..dfc40a1a 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left.js
@@ -4,12 +4,12 @@ import LeftCenter from './left/left-center'
 import LeftTop from './left/left-top'
 
 const Left = (props) => {
-    const { roadData,loading } = props
+    const { roadData, loading } = props
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginLeft: "1%" }}>
-            <LeftTop roadData={roadData} loading ={loading}/>
-            <LeftCenter roadData={roadData} loading ={loading}/>
-            <LeftBottom roadData={roadData} loading ={loading}/>
+        <div style={{ position: 'absolute', left: 0, width: "23%", height: "100%", marginLeft: "1%" }}>
+            <LeftTop roadData={roadData} loading={loading} />
+            <LeftCenter roadData={roadData} loading={loading} />
+            <LeftBottom roadData={roadData} loading={loading} />
         </div>
     )
 }
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right.js b/web/client/src/sections/quanju/containers/footer/conserve/right.js
index b96513e2..2fb079ee 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right.js
@@ -4,12 +4,12 @@ import RightCenter from './right/right-center'
 import RightTop from './right/right-top'
 
 const Right = (props) => {
-    const { highwaysData,roadMaintenances } = props
+    const { highwaysData, roadMaintenances } = props
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginRight: "1%", }}>
-            <RightTop  highwaysData={highwaysData}/>
-            <RightCenter highwaysData={highwaysData}/>
-            <RightBottom roadMaintenances={roadMaintenances}/>
+        <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
+            <RightTop highwaysData={highwaysData} />
+            <RightCenter highwaysData={highwaysData} />
+            <RightBottom roadMaintenances={roadMaintenances} />
         </div>
     )
 }
diff --git a/web/client/src/sections/quanju/containers/footer/gis/gis.js b/web/client/src/sections/quanju/containers/footer/gis/gis.js
index 46016561..f711e91e 100644
--- a/web/client/src/sections/quanju/containers/footer/gis/gis.js
+++ b/web/client/src/sections/quanju/containers/footer/gis/gis.js
@@ -21,9 +21,9 @@ const Gis = (props) => {
   const loadMap = () => {
     const map = new AMap.Map(MAPID, {
       resizeEnable: true,
-      center: [115.912663, 28.543149],//地图中心点，初始定位加载显示楼块
-      zoom: 15,//地图显示的缩放级别
-      zooms: [10, 12],
+      center: [115.99255, 28.503617],//地图中心点，初始定位加载显示楼块
+      zoom: 8,//地图显示的缩放级别
+      zooms: [8, 18],
       pitch: 0, // 地图俯仰角度，有效范围 0 度- 83 度
       viewMode: '3D', // 地图模式
       mapStyle: 'amap://styles/fb26776387242721c2fc32e2cb1daccc',
@@ -42,8 +42,8 @@ const Gis = (props) => {
   };
 
   return (
-    <div style={{ position: 'absolute', width: '100%', backgroundColor: '#101824', height: '100%', minHeight: 700 }}>
-      <div id={MAPID} style={{ width: '100%', height: '100%', background: "#101824", minHeight: 700 }} />
+    <div style={{ position: 'absolute', width: '100%',  height: '100%' }}>
+      <div id={MAPID} style={{ width: '100%', height: '100%',}} />
       {mapObj ? <Bounds map={mapObj} /> : ''}
     </div >
   )