diff --git a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js index 01857791..b5d6319e 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js @@ -132,7 +132,14 @@ function Leftbottom(props) { // }; const option = { tooltip: { - trigger: "item", + show: true, + trigger: 'item', + position: 'right', + backgroundColor: 'rgba(0,0,0,0.7)', + textStyle: { + color: '#fff', + }, + formatter: (values) => `${values.seriesName}
${values.marker} ${values.name}${values.value}公里`, }, // title: { // text:total,//主标题文本 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 d18477ed..cfa0348b 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js @@ -47,7 +47,14 @@ function Rightbottom(props) { var titleNum = 15 const option = { tooltip: { - trigger: "item", + show: true, + trigger: 'item', + position: 'right', + backgroundColor: 'rgba(0,0,0,0.7)', + textStyle: { + color: '#fff', + }, + 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 e5cbeb9c..c7a497ab 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 { dispatch } = props let data1 = [ @@ -71,18 +72,21 @@ const Build = (props) => { return resValue } let datas = Object.keys(buildingnumber?.townRoad || {}).map((item)=>({name:item,number:buildingnumber.townRoad[item].roadCount,gongli:Number(keepThreeNum(buildingnumber.townRoad[item].mileage))})) - + let list = datas.sort((a,b)=>{ + return b.number - a.number + }) + // console.log(list,'红红火') //道路等级数据 let alldengji = Object.keys(buildingnumber?.roadLevel || {}).map((item)=>({name:item,value:Number(keepThreeNum(buildingnumber.roadLevel[item]))})) let onlineproject = Object.keys(buildingnumber?.townProject||{}).map((item)=>({name:item,total:buildingnumber.townProject[item]})) - let sunonlineproject = onlineproject.reduce((x,y)=>x+y.total,0) - let safetyData = alldengji.filter(item=>item.name!=='null') - let sundata = data.reduce((x,y)=>x+y.value,0) - let sunsafetyData = safetyData.reduce((x,y)=>x+y.value,0) - console.log(safetyData,'好凶猛') - console.log(data1,'对比') + let sunonlineproject = onlineproject?.reduce((x,y)=>x+y.total,0) + let safetyData = alldengji?.filter(item=>item.name!=='null') + let sundata = data?.reduce((x,y)=>x+y.value,0) + let sunsafetyData = safetyData?.reduce((x,y)=>x+y.value,0) + // console.log(safetyData,'好凶猛') + // console.log(data1,'对比') // console.log(totalgongli,"好好的") // console.log(keepThreeNum(totalgongli),'jjjjj') useEffect(()=>{ @@ -97,7 +101,7 @@ const Build = (props) => { // },0,15) const rendercontent = ()=>{ return (
- {datas.map(({name,number,gongli},index)=>
+ {list.map(({name,number,gongli},index)=>
{name} {number} {gongli} @@ -130,7 +134,7 @@ const Build = (props) => {
-
@@ -162,7 +166,7 @@ const Build = (props) => { - { total={keepThreeNum(sundata)} // colorList={colorList} // underColorList={underColorList} - /> + />:
暂无数据
}
@@ -191,11 +195,11 @@ const Build = (props) => { - + data={keepThreeNum(safetyData)}/>:
暂无数据
}