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 7ba29493..75fe7a59 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 @@ -42,12 +42,13 @@ const Right = (props) => { }} onMouseLeave={() => { setBeijing() }}> - {beijing == index ? : ""} + {beijing == index ? : ""} {beijing == index ? : ""} -
日常养护
- {item.user?.name ?{item.user.name}
:--
} -{item.road ? item.road : "--"}
-{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
+{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -60,7 +61,7 @@ const Right = (props) => {占比{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%
{roads?.["县"].toFixed(3)}公里县道道路
乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里
-占比{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%
日常养护
- {item.user?.name ?{item.user.name}
:--
} -{item.road ? item.road : "--"}
-{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -61,7 +66,7 @@ const Right = (props) => {占比{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%
{roads?.["县"].toFixed(0)}个县涵洞
乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(0)}个
-占比{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%
日常养护
- {item.user?.name ?{item.user.name}
:--
} -{item.road ? item.road : "--"}
-{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
+{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "———" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -60,7 +61,7 @@ const Right = (props) => {占比{(roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}%
+占比{((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%
{roads?.["大桥"]}座大桥
中小桥梁{roads?.["小桥"] + roads?.["中桥"]}座
-占比{((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}%
+占比{(((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%
{"[0,30)"}
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 997b5782..fabe7b54 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 @@ -45,7 +45,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() * (3 + 0)))).toFixed(2)}Km/h
+{(speed + ((Math.random() * (6) - 3))).toFixed(2)}Km/h
{title || []}
*/} - - {title || []} + + {title || []}