From 5dede625243b87aef69e91a0dae56ccb16ac6606 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 2 Sep 2022 21:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer/conserve/left/left-center.js           |  4 ++--
 .../containers/footer/conserve/left/zhexin.js     | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

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 a125a81e..6a1180b4 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
@@ -20,12 +20,12 @@ const LeftCenter = (props) => {
             <Module style={style} title={"各乡镇养护里程及费用"}>
                 <div onClick={() => {
                     setFlag(false)
-                }} style={{ position: "absolute", top: "38.2%", left: "80%", width: "50px", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} >
+                }} style={{ position: "absolute", top: "38.5%", left: "80%", width: "50px", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} >
                     {/* <img /> */}
                     <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ color:`${flag?'rgba(216,240,255,0.8000)':'#07b9fe'}`,marginTop:0}}>累计</p></div>
                 <div onClick={() => {
                     setFlag(true)
-                }} style={{ position: "absolute", width: "50px", left: "60%", top: "38.2%", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "2%", borderLeft: "solid 2px #6E7A83", }}>
+                }} style={{ position: "absolute", width: "50px", left: "60%", top: "38.5%", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "2%", borderLeft: "solid 2px #6E7A83", }}>
                     {/* <img /> */}
                     <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ color:`${flag?'#07b9fe':'rgba(216,240,255,0.8000)'}`}}  >上月</p></div >
                 {
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js b/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js
index a3623c62..21901043 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js
@@ -99,10 +99,10 @@ const ZheXian = (props) => {
             },
             grid: {
                 borderWidth: 0,
-                top: 50,
-                bottom: 20,
+                top: 60,
+                bottom: 10,
                 right: 20,
-                left: 60,
+                left: 20,
                 textStyle: {
                     color: "#fff",
                 },
@@ -146,6 +146,7 @@ const ZheXian = (props) => {
                     type: "value",
                     splitLine: {
                         show: true,
+                    position: "right",
                         lineStyle: {
                             color: "rgba(176,215,255,0.2500)",
                             type: "dashed",
@@ -169,7 +170,6 @@ const ZheXian = (props) => {
                 {
                     type: "value",
                     min: 0,
-                    position: "right",
                     splitLine: {
                         show: true,
                         lineStyle: {
@@ -198,7 +198,7 @@ const ZheXian = (props) => {
                     name: "里程",
                     type: "bar",
                     barWidth: 20,
-
+                    yAxisIndex: 1,
                     itemStyle: {
                         normal: {
                             color: {
@@ -229,7 +229,6 @@ const ZheXian = (props) => {
                     type: "line",
                     symbolSize: 10,
                     symbol: "circle",
-                    yAxisIndex: 1,
                     itemStyle: {
                         normal: {
                             color: "#1978E5",
@@ -268,12 +267,12 @@ const ZheXian = (props) => {
             <div /* onClick={() => {
                     setFlag(!flag)
                     console.log(flag);
-                }} */ style={{ position: "absolute", top: "38.2%", left: "14%", width: "72px", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} >
+                }} */ style={{ position: "absolute", top: "38.5%", left: "14%", width: "72px", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} >
                 <img style={{marginBottom:4,marginLeft:-32}} src={zhexian} />
                 <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px", position: "absolute", top: "0px",marginLeft:36 }}>元</p></div>
             <div /* onClick={() => {
                     setFlag(false)
-                }}  */style={{ position: "absolute", width: "72px", left: "34%", top: "38.2%", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", marginRight: "4%", borderLeft: "solid 2px #6E7A83" }}>
+                }}  */style={{ position: "absolute", width: "72px", left: "34%", top: "38.5%", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", marginRight: "4%", borderLeft: "solid 2px #6E7A83" }}>
                 <img style={{marginBottom:4,marginLeft:-32}} src={zhuzhuang}/>
                 <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px", position: "absolute", top: "0px",marginLeft:36 }} >km</p></div >
             <div ref={chartRef} style={{ width: '100%', height: '23vh' }}></div>