Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

web/client/src/sections/quanju/containers/footer/build/style.less

@@ -1,4 +1,4 @@
-@media screen and (max-width:1281px){
+@media screen and (max-width:1367px){
     html{
         font-size: 10px;
     }
@@ -269,10 +269,11 @@
             .build-right-bottom-title{
                 display: flex;
                 flex-direction: column;
-                align-items: center;
+                // align-items: center;
                 justify-content: center;
                 position: absolute;
-                 left: 16%;
+                align-items: center;
+                 left: 19%;
                  top:38%;
                     h2{
                         font-size: 1.25rem;

web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js

@@ -4,7 +4,7 @@ import * as echarts from 'echarts';
 
 const PieChart = (props) => {
 
-  const { width, height, data, colorList, underColorList, total, text } = props
+  const { width, height, data, colorList, underColorList, total, text, textLeft,numLeft } = props
   const chartRef = useRef(null);
   let name = [], emptyName = []
   // const name = data?.map(d)
@@ -43,13 +43,13 @@ const PieChart = (props) => {
             a: {
               color: '#E9F7FF',
               fontSize: 14,
-              padding:[0,2]
+              padding: [0, 2]
             },
             b: {
               fontSize: 16,
               fontFamily: 'YouSheBiaoTiHei',
               color: '#fff',
-              padding:[0,0,0,10]
+              padding: [0, 0, 0, 10]
             },
           }
         }
@@ -57,40 +57,17 @@ const PieChart = (props) => {
       grid: {
         left: '10%'
       },
-      // title: [
-      //   {
-      //     text: text,
-      //     top: "58%",
-      //     left: '16%',
-      //     textStyle: {
-      //       color: "#E9F7FF",
-      //       fontSize: 14,
-      //     },
-      //   },
-      //   {
-      //     text: total,
-      //     top: "40%",
-      //     left: '10%',
-      //     textStyle: {
-      //       fontSize: "30",
-      //       color: "#FFFFFF",
-      //       fontFamily: "YouSheBiaoTiHei",
-      //     },
-      //   },
-      // ],
       graphic: {
         elements: [
           {
             type: 'image',
             style: {
               image: 'assets/images/quanju/chart-circle.png',
-              width: 120,
+              width: 110,
-              height: 120,
+              height: 110,
               align: 'center',
-              // x:90,
-              // y:100
             },
-            left: '14%',
+            left: '12.8%',
             top: 'center',
 
             bounding: 'raw'
@@ -104,8 +81,8 @@ const PieChart = (props) => {
               fill: '#fff',
               font: '12px "YouSheBiaoTiHei", sans-serif',
             },
-            left: '17%',
+            left: textLeft,
-            top: '55%',
+            top: '58%',
           },
           {
             type: 'text',
@@ -115,7 +92,7 @@ const PieChart = (props) => {
               fill: '#fff',
               font: '20px "YouSheBiaoTiHei", sans-serif',
             },
-            left: '18.5%',
+            left: numLeft,
             top: 'center',
           },
         ],
@@ -142,7 +119,7 @@ const PieChart = (props) => {
           data: emptyName,
         },
         {
-          name: "已绿化里程统计",
+          name: text,
           type: "pie",
           radius: ["65%", "75%"],
           center: ['25%', '50%'],

web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js

@@ -36,6 +36,8 @@ const LeftBottom = (props) => {
           text='已绿化里程'
           total={totalData?.toFixed(3) || 0}
           colorList={colorList}
+          textLeft={'20%'}
+          numLeft={'16%'}
           underColorList={underColorList}
         />
       </Module>

web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js

@@ -56,6 +56,8 @@ const RightBottom = (props) => {
           width='100%'
           height='100%'
           text='养护总数'
+          textLeft={'21%'}
+          numLeft={'23%'}
           total={totalData || 0}
           colorList={colorList}
           underColorList={underColorList}

web/client/src/sections/quanju/containers/footer/guanli/style.less

@@ -1,4 +1,4 @@
-@media screen and (max-width:1281px){
+@media screen and (max-width:1366px){
     html{
         font-size: 10px;
     }