diff --git a/api/app/lib/controllers/report/index.js b/api/app/lib/controllers/report/index.js index c0446dd0..bc35f341 100644 --- a/api/app/lib/controllers/report/index.js +++ b/api/app/lib/controllers/report/index.js @@ -581,7 +581,7 @@ async function roadSpotPrepare (ctx) { }) if (lastVillage) { - let villageNnmter = 0 + let villageNnmter = 0 lastVillage.forEach(d => { if (villageNnmter < (100 - (countyPercentage == 75 ? 20 : 10))) { lastVillageRoadRoadIds = lastVillageRoadRoadIds.concat(d.villageRoadId) || [] @@ -1044,6 +1044,9 @@ async function roadSpotDetail (ctx) { ...(keyword ? { routeName: { $ilike: `%${keyword}%` } } : {}), del: false, }, + include: [{ + model: models.Village, + }] }, { model: models.RoadSpotCheckPreview, attributes: ['id'], diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js index ff4e7ad9..49420d6a 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js @@ -52,25 +52,7 @@ const MaintenanceSpotCheck = (props) => { { title: "银三角管委会", value: "360121471000" }, { title: "幽兰镇", value: "360121104000" }, ] - const [village, setVillage] = useState() - useEffect(() => { - const fetchData = async () => { - try { - const res = await dispatch(getVillageList({})) - let data = res.payload.data - // console.log(data) - data.map(s => { - setVillage(s) - }) - } catch (error) { - console.error(error) - } - } - - fetchData() - }, [dispatch]) - // console.log(village) const columns = [ { title: '抽查日期', @@ -238,7 +220,7 @@ const MaintenanceSpotCheck = (props) => { } } }, - { title: '所属行政村', key: 'villageId', dataIndex: 'villageId', render: (_, r) => r.road?.villageId === village.id ? village.name : '--' }, + { title: '所属行政村', key: 'villageId', dataIndex: 'villageId', render: (_, r) => r.road?.village?.name || '--' }, { title: '道路名称', key: 'routeName', dataIndex: 'routeName', render: (_, r) => r.road?.routeName || '--' }, { title: '道路代码', key: 'routeCode', dataIndex: 'routeCode', render: (_, r) => r.road?.routeCode || '--' }, // { title: '路段序号', key: 'sectionNo', dataIndex: 'sectionNo', render: (_, r) => r.road?.sectionNo || '--' },