From db9977073be3c8481a8e87044ab86a6a7875bc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Thu, 28 Jul 2022 18:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/quanju/actions/example.js    | 23 +++++++++++++++++++
 .../footer/conserve/chart/pie-chart.js        |  2 +-
 .../containers/footer/conserve/index.js       | 15 ++++++------
 .../footer/conserve/left/left-center.js       |  4 ++--
 .../footer/conserve/left/left-top.js          |  4 ++--
 .../footer/conserve/right/right-center.js     |  2 +-
 .../footer/conserve/right/right-top.js        |  2 +-
 7 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/web/client/src/sections/quanju/actions/example.js b/web/client/src/sections/quanju/actions/example.js
index 075e74af..9f1b02df 100644
--- a/web/client/src/sections/quanju/actions/example.js
+++ b/web/client/src/sections/quanju/actions/example.js
@@ -122,4 +122,27 @@ export function getGodshuju() {
         // reducer: { name: 'busTier' }
         // >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16
     });
+}
+
+//获取路政列表
+export function getHighwayList() {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        actionType: 'GET_HIGHWAYS',
+        url: ApiTable.getHighways,
+        msg: { error: '获取路政列表失败' },
+        reducer: { name: 'highways' }
+    });
+}
+//获取道路养护统计及列表
+export function getRoadMaintenanceList() {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        actionType: 'GET_ROAD_MAINTENANCES',
+        url: ApiTable.getRoadMaintenance,
+        msg: { error: '获取道路养护列表失败' },
+        reducer: { name: 'roadMaintenances' }
+    });
 }
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js b/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js
index f1460b8a..3796a83c 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js
@@ -62,7 +62,7 @@ const PieChart = (props) => {
           {
             type: 'image',
             style: {
-              image: 'assets/images/quanju/chart-circle.png',
+              image: '/assets/images/quanju/chart-circle.png',
               width: 110,
               height: 110,
               align: 'center',
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 8d6328c1..7a141fe5 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/index.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js
@@ -19,24 +19,25 @@ const Conserve = (props) => {
             setLoading(false)
             setRoadData(res.payload.data || {})
         })
-        dispatch(getHighways()).then(res => {
+        dispatch(getHighways()).then(res =>{
             setHighwaysData(res.payload.data || [])
         })
-        dispatch(getRoadMaintenances()).then(res => {
+        dispatch(getRoadMaintenances()).then(res =>{
             setRoadMaintenances(res.payload.data || [])
         })
     }, [])
 
     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 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>
     )
 }
 function mapStateToProps(state) {
+
     // const { auth } = state;
 
     return {
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
index 94ed8fa9..9aa8b9ea 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
@@ -227,8 +227,8 @@ const LeftCenter = (props) => {
 
                 <Row align='middle' style={{ padding: '10px 3% 0px 15px' }}>
                     <Col span={15}>
-                        <img src='assets/images/quanju/kelvhua_icon.png' alt='icon' style={{ width: '26%' }} />
-                        <span style={{ color: '#C2EEFF', marginLeft: 5 }}>可绿化里程总数</span>
+                        <img src='/assets/images/quanju/kelvhua_icon.png' alt='icon' style={{ width: '26%' }} />
+                        <span style={{ color: '#C2EEFF', marginLeft: 5, textShadow: '0px 0px 4px #07B9FE' }}>可绿化里程总数</span>
                     </Col>
                     <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff' }}>{totalData.toFixed(3) || 0}</Col>
                 </Row>
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js
index 5a3fc468..944fdf81 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js
@@ -204,13 +204,13 @@ const LeftTop = (props) => {
 
             <div ref={frequentlyChartRef} style={{ width: "50%" }}></div>
           </div>
-          <img src='assets/images/quanju/circle.png' style={{
+          <img src='/assets/images/quanju/circle.png' style={{
             position: 'absolute',
             left: '23%',
             top: '66%',
             zIndex: 999
           }} />
-          <img src='assets/images/quanju/circle.png' style={{
+          <img src='/assets/images/quanju/circle.png' style={{
             position: 'absolute',
             right: '27%',
             top: '66%',
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
index 5aad0bdd..7189d83d 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
@@ -42,7 +42,7 @@ const RightCenter = (props) => {
                 {
                   item?.map(i => (
                     <div style={{ display: 'flex', width: '50%' }} key={i.id}>
-                      <img src={i.icon} alt='icon' style={{ width: '36%', height: '100%' }} />
+                      <img src={'/'+i.icon} alt='icon' style={{ width: '36%', height: '100%' }} />
                       <div style={{ marginLeft: 10 }}>
                         <div style={textStyle}>{i.name}</div>
                         <div style={numStyle}>{`${i.count}个`}</div>
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
index 11ed88f3..44d92965 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
@@ -46,7 +46,7 @@ const RightTop = (props) => {
                 {
                   item?.map(i => (
                     <div style={{ display: 'flex', width: '50%' }} key={i.id}>
-                      <img src={i.icon} alt='icon' style={{ width: '36%', height: '100%' }} />
+                      <img src={'/' + i.icon} alt='icon' style={{ width: '36%', height: '100%' }} />
                       <div style={{ marginLeft: 10 }}>
                         <div style={textStyle}>{i.name}</div>
                         <div style={numStyle}>{`${i.count}${i.unit}`}</div>