diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js index cfa0348b..17788224 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js @@ -54,7 +54,7 @@ function Rightbottom(props) { textStyle: { color: '#fff', }, - formatter: (values) => `${values.seriesName}
${values.marker} ${values.name}${values.value}公里`, + formatter: (values) => `${values.seriesName}
${values.marker} ${values.name}${values.value}条`, }, legend: { orient: "vertical", diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js index c7a497ab..ad0ac359 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js +++ b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js @@ -83,7 +83,7 @@ const RNAKS = [FIRST, SECOND, THIRD]
-
在建公路工程数量
+
在建公路工程数量/个

{sundata}

{ const requestbuildingnumber = async ()=>{ const res = await dispatch(getdaolutongji()); let alltype = Object.keys(res.payload.data?.roadType || {}).map((item)=>({name:item,value:Number(keepThreeNum(res.payload.data.roadType[item]))})) - console.log(alltype,'打他啊') + // console.log(alltype,'打他啊') setdata(alltype.filter(item=>item.name==='县'||item.name==="乡"||item.name==='村')) setbuildingnumber(res.payload.data) - console.log(res.payload.data,'哈哈哈') + // console.log(res.payload.data,'哈哈哈') } @@ -118,7 +118,9 @@ const Build = (props) => { - {buildingnumber&&buildingnumber.buildedRoad!==0&&totalgongli!==0?
+
+ + {buildingnumber&&buildingnumber.buildedRoad!==0&&totalgongli!==0?
{/* */} @@ -137,6 +139,7 @@ const Build = (props) => {
{buildingnumber?.buildedRoad || 0}
:} +
{ {safetyData&&sunsafetyData!==0?:}
diff --git a/web/client/src/sections/quanju/containers/footer/build/style.less b/web/client/src/sections/quanju/containers/footer/build/style.less index 40ddc797..7af5871d 100644 --- a/web/client/src/sections/quanju/containers/footer/build/style.less +++ b/web/client/src/sections/quanju/containers/footer/build/style.less @@ -178,7 +178,7 @@ align-items: center; justify-content: center; position: absolute; - left: 16%; + left: 15%; top:38%; h2{ font-size: 1.25rem; @@ -278,7 +278,7 @@ justify-content: center; position: absolute; align-items: center; - left: 19%; + left: 15%; top:38%; h2{ font-size: 1.25rem; diff --git a/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js b/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js index ea90e7dd..72c666e7 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js @@ -15,7 +15,7 @@ export default function LeftItem({datas}) { textStyle: { color: '#fff', }, - formatter: (values) => ` ${values.name}${datas.processed}个`, + formatter: (values) => `${values.name}${datas.processed}条`, }, title: { text: `${(datas.processed*100/datas.total).toFixed(2)}%`, @@ -78,6 +78,7 @@ export default function LeftItem({datas}) { }, series: [{ type: 'bar', + showBackground: true,//这里只有显示背景才能出现背景灰色的线 data: [{ name: '已处理', value: (datas.processed*100/datas.total).toFixed(2), @@ -97,34 +98,15 @@ export default function LeftItem({datas}) { coordinateSystem: 'polar', roundCap: true, barWidth: 8, - barGap: '-100%', // 两环重叠 - z: 2, - },{ // 灰色环 - type: 'bar', - data: [{ - value: 100, - itemStyle: { - color: '#092B7B ', - shadowColor: 'rgba(0, 0, 0, 0.2)', - shadowBlur: 5, - shadowOffsetY: 2 - } - }], - coordinateSystem: 'polar', - roundCap: true, - barWidth: 8, - barGap: '-100%', // 两环重叠 - z: 1 - }] + }, + ] } - - - chartInstance.setOption(option); }, []) return (
+
{datas.name}
{datas.total}
diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js index f14ce2c8..9ac77028 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -14,7 +14,7 @@ const Guanli = (props) => { const [rightitemlist,setrightitemlist] = useState() const requestleftDatas = async()=>{ const res = await dispatch(getjiandmanage()) - res.payload.data.sort((a,b)=>{ + res.payload.data?.sort((a,b)=>{ return parseInt(b.total) - parseInt(a.total) }) setleftDatas(res.payload.data) diff --git a/web/client/src/sections/quanju/containers/footer/guanli/style.less b/web/client/src/sections/quanju/containers/footer/guanli/style.less index 3ddaa180..c406eb6b 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/style.less +++ b/web/client/src/sections/quanju/containers/footer/guanli/style.less @@ -19,6 +19,7 @@ .guanli-left-item{ box-sizing: border-box; width: 85%; + position: relative; // height: 30%; height: 24vh; margin: 0 auto 3%;