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', 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)}公里县道道路
{/*乡村道道路{(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)}%
{/*{title || []}
*/} 养护事件 -道路{nums ? nums[0]?.count : []}次
+道路{nums ? nums[0]?.count : 0}次
{/* */}占比{((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)}个县涵洞
乡村涵洞{(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)}%
{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?.["大桥"]}座大桥
中小桥梁{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)}%
{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)}
涵洞统计个
-{(culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}
+{isNaN((culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)) ? "" : (culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}
桥梁统计座
-{(bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}
+{isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}
{(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) => {车牌号