diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js index 75fe7a59..c08e3389 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js +++ b/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 ? : ""} {beijing == index ? : ""} -

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

+

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

日常养护

{item.user?.name ?

{item.user.name}

:

--

}

{item.road ? item.road : "--"}

@@ -86,6 +87,7 @@ const Right = (props) => {

道路{nums ? nums[0]?.count : []}

{/* */} + {/* */} { divHeight={"100%"} divId={"screen"} /> + {/* */} diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js index e09e4731..05670dbc 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js @@ -49,7 +49,7 @@ const Right = (props) => { }}> {beijing == index ? : ""} {beijing == index ? : ""} -

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

+

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

日常养护

{item.user?.name ?

{item.user.name}

:

--

}

{item.road ? item.road : "--"}

diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js index 75a35e83..7d16c944 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js @@ -44,7 +44,7 @@ const Right = (props) => { }}> {beijing == index ? : ""} {beijing == index ? : ""} -

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

+

{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}

日常养护

{item.user?.name ?

{item.user.name}

:

--

}

{item.road ? item.road : "--"}

diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js b/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js index bccc2914..db11a988 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js +++ b/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}
{b} : {c}%", + formatter: "{a}
{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" +