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

web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import Lun from "../right/lunbo"
 import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
 import moment from 'moment'
+import { Spin } from 'antd'
 
 const Right = (props) => {
     const { dispatch } = props
@@ -44,7 +45,7 @@ const Right = (props) => {
                             }}>
                                 {beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
                                 {beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
-                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
+                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
                                 <p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
                                 {item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
                                 <p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
@@ -86,6 +87,7 @@ const Right = (props) => {
                         <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums ? nums[0]?.count : []}</span><span style={{ marginLeft: "10%" }}>次</span></p>
                         {/* <img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} /> */}
                     </div>
+                    {/* <Spin spinning={true} style={{ height: "80%" }}> */}
                     <Lun
                         // canScroll={true}
                         content={renderBody()}
@@ -93,6 +95,7 @@ const Right = (props) => {
                         divHeight={"100%"}
                         divId={"screen"}
                     />
+                    {/* </Spin> */}
                 </div>
 
             </div>

web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js

@@ -49,7 +49,7 @@ const Right = (props) => {
                             }}>
                                 {beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
                                 {beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
-                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
+                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
                                 <p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
                                 {item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
                                 <p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>

web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js

@@ -44,7 +44,7 @@ const Right = (props) => {
                             }}>
                                 {beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
                                 {beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
-                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
+                                <p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
                                 <p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
                                 {item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
                                 <p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>

web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js

@@ -66,7 +66,7 @@ const Lefttopecharts = (props) => {
         var option = {
             // backgroundColor: "#0E1327",
             tooltip: {
-                formatter: "{a} <br/>{b} : {c}%",
+                formatter: "{a} <br/>{b} : {c}",
             },
 
             series: [
@@ -104,8 +104,8 @@ const Lefttopecharts = (props) => {
                             if (value !== 0) {
                                 // var num = Math.round(value);
                                 return (
-                                    value.toFixed(2) +
-                                    "%" +
+                                    value +
+
                                     "\n" +
                                     "\n" +
                                     "\n" +