diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js b/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js index 5f7a8169..f789bc9a 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js @@ -50,10 +50,10 @@ const Lefttbottom = (props) => { }}> {beijing == index ? : ""}
{item.responsibleUnitForManagementAndMaintenance}
-
{item.countyHighway||'/'}
-
{item.townshipRoad||'/'}
-
{item.villageRoad||'/'}
-
{item.bridge||'/'}
+
{item.countyHighway||'--'}
+
{item.townshipRoad||'--'}
+
{item.villageRoad||'--'}
+
{item.bridge||'--'}
{/* { num == index ?
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js b/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js index 596af5c5..a1cefc6b 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js @@ -74,7 +74,28 @@ const ZheXian = (props) => { color: "#fff", }, }, - formatter: "{a}
{b}: {c}", + formatter: function (params, ticket, callback) { + var res = params[0].name; + + for (var i = 0, l = params.length; i < l; i++) { + if (params[i].seriesType === "line") { + res += + "
" + + params[i].seriesName + + " : " + + (params[i].value ? params[i].value : "-") + + "元"; + } else { + res += + "
" + + params[i].seriesName + + " : " + + (params[i].value ? params[i].value : "-") + + "km"; + } + } + return res; + }, }, grid: { borderWidth: 0, @@ -85,6 +106,7 @@ const ZheXian = (props) => { textStyle: { color: "#fff", }, + containLabel: true, }, legend: { x: "60%", @@ -144,11 +166,38 @@ const ZheXian = (props) => { show: false, }, }, + { + type: "value", + min: 0, + position: "right", + splitLine: { + show: true, + lineStyle: { + color: "rgba(176,215,255,0.2500)", + type: "dashed", + }, + }, + axisLine: { + lineStyle: { + color: "rgba(216,240,255,0.800)", + }, + }, + axisTick: { + show: false, + }, + axisLabel: { + interval: 0, + }, + splitArea: { + show: false, + }, + }, ], series: [ { - name: "", + name: "里程", type: "bar", + barWidth: 20, itemStyle: { normal: { @@ -176,10 +225,11 @@ const ZheXian = (props) => { data: columnar||[], }, { - name: "", + name: "费用", type: "line", symbolSize: 10, symbol: "circle", + yAxisIndex: 1, itemStyle: { normal: { color: "#1978E5",