From ec02aeb95be37cd177f8235fe64cd0ebcfb1ab9f Mon Sep 17 00:00:00 2001 From: wangyue Date: Fri, 29 Jul 2022 15:36:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?nan=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/footer/leadership/centerleft/daolu.js | 10 +++++----- .../footer/leadership/centerleft/handong.js | 10 +++++----- .../footer/leadership/centerleft/qiqoliang.js | 10 +++++----- .../containers/footer/leadership/centerleft/top.js | 6 +++--- .../footer/leadership/left/echarts/lefttopecharts.js | 12 ++++++------ .../containers/footer/leadership/left/left-top.js | 2 +- .../footer/leadership/right/right-bottom.js | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) 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 5cddb316..fc9f8d61 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 @@ -66,8 +66,8 @@ const Right = (props) => {
{/* */} -

占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

-

{roads?.["县"].toFixed(3)}公里县道道路

+

占比{isNaN(((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : ((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+

{isNaN(roads?.["县"].toFixed(3)) ? "" : roads?.["县"].toFixed(3)}公里县道道路

{/* */}
@@ -79,8 +79,8 @@ const Right = (props) => {
{/* */} -

乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

-

占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+

乡村道道路{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(3)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

+

占比{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

{/* */}
@@ -90,7 +90,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

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

+

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

{/* */}
{/* */} 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 034e2d60..b2f26344 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 @@ -72,8 +72,8 @@ const Right = (props) => {
{/* */}
-

占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

-

{roads?.["县"].toFixed(0)}个县涵洞

+

占比{isNaN(((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : ((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+

{isNaN(roads?.["县"].toFixed(0)) ? "" : roads?.["县"].toFixed(0)}个县涵洞

@@ -85,8 +85,8 @@ const Right = (props) => {
-

乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(0)}个

-

占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+

乡村涵洞{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(0)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(0)}个

+

占比{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

@@ -95,7 +95,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

涵洞{nums ? nums[0]?.count : []}次

+

涵洞{nums ? nums[0]?.count : 0}次

{/* */}
{
-

占比{((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

-

{roads?.["大桥"]}座大桥

+

占比{isNaN(((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : ((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

+

{isNaN(roads?.["大桥"]) ? "" : roads?.["大桥"]}座大桥

@@ -74,8 +74,8 @@ const Right = (props) => { {/*
*/}
-

中小桥梁{roads?.["小桥"] + roads?.["中桥"]}座

-

占比{(((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

+

中小桥梁{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}座

+

占比{isNaN((((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : (((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

@@ -83,7 +83,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

桥梁{nums ? nums[0]?.count : []}次

+

桥梁{nums ? nums[0]?.count : 0}次

{/* */}
{

道路统计公里

-

{(list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}

+

{isNaN((list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)) ? "" : (list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}

{ @@ -53,7 +53,7 @@ const Leftcenter = (props) => {

涵洞统计个

-

{(culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}

+

{isNaN((culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)) ? "" : (culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}

{ @@ -67,7 +67,7 @@ const Leftcenter = (props) => {

桥梁统计座

-

{(bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}

+

{isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}

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 db11a988..17aeace1 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 @@ -104,13 +104,13 @@ const Lefttopecharts = (props) => { if (value !== 0) { // var num = Math.round(value); return ( - value + + isNaN(value) ? "" : value + - "\n" + - "\n" + - "\n" + - "\n" + - "\n" + "\n" + + "\n" + + "\n" + + "\n" + + "\n" ); } else { diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js index 58caed0e..373f10e0 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js @@ -48,7 +48,7 @@ const Lefttop = (props) => { fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)", position: "absolute", left: "30%", top: "65%" }}>预测明日

-

{(speed + ((Math.random() * (6) - 3))).toFixed(2)}Km/h

+

{isNaN((speed + ((Math.random() * (6) - 3))).toFixed(2)) ? "" : (speed + ((Math.random() * (6) - 3))).toFixed(2)}Km/h

diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js index d90e484d..9f954ced 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js @@ -49,7 +49,7 @@ const Rightbottom = (props) => {
- 已处理{nums}件 + 已处理{nums ? nums : 0}件

车牌号

From 0e9b207f593cab5dd25bd07e8023aebfd29d9c1f Mon Sep 17 00:00:00 2001 From: LUCAS Date: Fri, 29 Jul 2022 15:47:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=B7=A1=E6=9F=A5=E7=AE=A1=E7=90=86=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/components/maintenanceTable.js | 5 +++-- web/client/src/sections/fillion/components/patrolTable.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index 36b1cc03..297d6087 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -13,7 +13,8 @@ import moment from 'moment'; const DetailForm = (props) => { const { visible, data, handleClose, loading } = props; const keyList = [ - { key: '问题编号', name: 'id' }, + { key: '编号', name: 'id' }, + { key: '工程类型', name: 'projectType' }, { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, @@ -91,7 +92,7 @@ const DetailList = (props) => { const columns = [ { - title: '问题编号', + title: '编号', key: 'id', dataIndex: 'id', align: 'center', diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 56cd5959..c7b268bb 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -14,7 +14,8 @@ import moment from 'moment'; const DetailForm = (props) => { const { visible, data, handleClose, loading } = props; const keyList = [ - { key: '问题编号', name: 'id' }, + { key: '编号', name: 'id' }, + { key: '工程类型', name: 'projectType' }, { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, @@ -92,7 +93,7 @@ const DetailList = (props) => { const columns = [ { - title: '问题编号', + title: '编号', key: 'id', dataIndex: 'id', align: 'center',