From 19ef4659c9b657dfe8d7c061939dc9d1d302283b Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Sat, 30 Jul 2022 12:52:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9A=84=E5=85=AC=E8=B7=AF=E6=80=BB=E6=9D=A1?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/containers/footer/build/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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..c10936c3 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) @@ -143,7 +144,7 @@ const Build = (props) => { :} - { totalcount && totalcount!==0?
From a098c7ead8e0e415526fa58cc0991134b0774518 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Sat, 30 Jul 2022 13:34:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/quanju/containers/footer/build/Leftbottom.js | 1 + .../quanju/containers/footer/build/Rightbottom.js | 3 ++- .../src/sections/quanju/containers/footer/build/index.js | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) 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 c10936c3..71afc009 100644 --- a/web/client/src/sections/quanju/containers/footer/build/index.js +++ b/web/client/src/sections/quanju/containers/footer/build/index.js @@ -118,7 +118,7 @@ const Build = (props) => { return ( <>
-
@@ -144,7 +144,7 @@ const Build = (props) => {
:}
- { totalcount && totalcount!==0?
@@ -211,12 +211,12 @@ const Build = (props) => {

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

 - {sunonlineproject!==0?:} - {safetyData&&sunsafetyData!==0? Date: Sat, 30 Jul 2022 13:38:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=88=E5=B7=A1=E6=9F=A5=EF=BC=8C=E5=85=BB=E6=8A=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/components/maintenanceTable.js | 7 ++++++- .../src/sections/fillion/components/patrolTable.js | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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',