diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js index 4ba183a5..e27834f7 100644 --- a/api/app/lib/controllers/data/vehicle.js +++ b/api/app/lib/controllers/data/vehicle.js @@ -7,8 +7,8 @@ async function get(ctx) { const { type } = ctx.request.body; const { name } = ctx.query; const sequelize = ctx.fs.dc.orm - const sqlStr = `select count(p.road_marking) 标线,count(p.roadside_ditch) 边沟, - count(p.guardrail) 护栏, count(p.roadside_trees) 行道树,count(p.wrong_lane) 错车道 + const sqlStr = `select sum(p.road_marking) 标线,sum(p.roadside_ditch) 边沟, + sum(p.guardrail) 护栏, sum(p.roadside_trees) 行道树,sum(p.wrong_lane) 错车道 from ( select t.*,row_number() over (partition by t.luduan order by t.time desc ) rn from ( select code_road||'-'||road_section_start||'-'||road_section_end luduan, diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js index 28d119a7..01390aec 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js @@ -450,7 +450,7 @@ const MaintenanceSpotCheck = (props) => {
@@ -468,19 +468,18 @@ const MaintenanceSpotCheck = (props) => { > - % - + */} -
- -
+ +