diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index ef49add2..f70d234f 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -99,6 +99,11 @@ const DetailList = (props) => { render: (text, record) => { return moment(record.time).format("YYYYMMDD") * 10000 + record.id; } + }, { + title: '工程类型', + key: 'projectType', + dataIndex: 'projectType', + align: 'center', }, { title: '所属道路', key: 'road', @@ -120,7 +125,7 @@ const DetailList = (props) => { align: 'center' }, { - title: '巡查人', + title: '养护人', width: 100, key: 'userName', dataIndex: 'userName', diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 1f633d9e..be471922 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -100,7 +100,14 @@ const DetailList = (props) => { render: (text, record) => { return moment(record.time).format("YYYYMMDD") * 10000 + record.id; } - }, { + }, + { + title: '工程类型', + key: 'projectType', + dataIndex: 'projectType', + align: 'center', + }, + { title: '所属道路', key: 'road', dataIndex: 'road', 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 396b74bb..b3e8e51f 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js @@ -274,6 +274,7 @@ legend: { return (
+ 公里

{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 ca86bf1f..8add83ce 100644 --- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js +++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js @@ -58,7 +58,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", @@ -172,6 +172,7 @@ function Rightbottom(props) { return (
+

{total||0}

道路总公里 diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js index 749ef58a..71afc009 100644 --- a/web/client/src/sections/quanju/containers/footer/build/index.js +++ b/web/client/src/sections/quanju/containers/footer/build/index.js @@ -56,7 +56,8 @@ const Build = (props) => { let t1 = Object.values(buildingnumber?.townRoad || {}) let totalgongli = t1.length!==0 ? t1.reduce((x,y)=>x+y.mileage,0):0 //乡镇道路占比总公里数 - let totalcount = t1.length !==0 ? t1.reduce((x,y)=>x+y.roadCount,0):0 //乡镇道路占比公路总条数 + // let totalcount = t1.length !==0 ? t1.reduce((x,y)=>x+y.roadCount,0):0 //乡镇道路占比公路总条数 + let totalcount = buildingnumber?.buildedRoad || 0 // let sungongli = alltype.reduce((x,y)=>x+y.value,0) @@ -117,7 +118,7 @@ const Build = (props) => { return ( <>
-
@@ -143,7 +144,7 @@ const Build = (props) => {
:}
- { totalcount && totalcount!==0?
@@ -210,12 +211,12 @@ const Build = (props) => {

全面建设好农村公路,切实发挥先行官作用

- {sunonlineproject!==0?:} - {safetyData&&sunsafetyData!==0?