Browse Source

道路修改调整

dev
wenlele 11 months ago
parent
commit
ded0d4dabe
  1. 4
      api/app/lib/controllers/report/index.js
  2. 1
      scripts/1.4.0/data/2_resource.sql
  3. 2
      web/client/src/sections/fillion/components/adjustment.js
  4. 3
      web/client/src/sections/fillion/containers/adjustLog.js
  5. 2
      web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js

4
api/app/lib/controllers/report/index.js

@ -833,10 +833,10 @@ async function roadSpotList (ctx) {
countyPercentage: item.countyPercentage,
spotCountyRoadCount: item.countyRoadId ? item.countyRoadId.length : 0,
spotTownRoadCount: item.townshipRoadId ? item.townshipRoadId.length : 0,
spotVillageRoadCount: item.villageId ? item.villageId.length : 0,
spotVillageRoadCount: item.villageRoadId ? item.villageRoadId.length : 0,
countyRoadId: item.countyRoadId,
townshipRoadId: item.townshipRoadId,
villageId: item.villageId,
villageRoadId: item.villageRoadId,
}
})
} catch (error) {

1
scripts/1.4.0/data/2_resource.sql

@ -0,0 +1 @@
INSERT INTO resource (code, name, parent_resource) VALUES ('ADJUSTLOG', '调整日志', 'ALLSELECT');

2
web/client/src/sections/fillion/components/adjustment.js

@ -79,7 +79,7 @@ const Adjustment = (props) => {
&& values?.routeCode == d?.routeCode && values?.sectionNo == d?.sectionNo)
dispatch(roadSpotChange({
previewId: editData?.previewId,
originRoadId: editData?.id,
originRoadId: editData?.road?.id,
changeRoadId: data?.id
})).then(res => {
if (res.success) {

3
web/client/src/sections/fillion/containers/adjustLog.js

@ -106,7 +106,7 @@ const AdjustLog = (props) => {
抽查日期
<RangePicker value={dateRange[0] ? [moment(dateRange[0]), moment(dateRange[1])] : []} onChange={(date, dateString) => {
setDateRange(dateString)
}} style={{ marginRight: 20 }} />
}} style={{ marginRight: 20, marginLeft: 10 }} />
<Button style={{ marginRight: 20 }} onClick={() => {
setPage(1)
setExpandedRowKeys([])
@ -157,7 +157,6 @@ const AdjustLog = (props) => {
placeholder=""
autoSize={{
minRows: 2,
maxRows: 6,
}}
/>
</Form.Item>

2
web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js

@ -265,7 +265,7 @@ const MaintenanceSpotCheck = (props) => {
setIsAdjustment(false)
}}
onOk={() => {
queryData({ startTime: dateRange[0], endTime: dateRange[1] })
detailData({ previewId: expandedRowKeys[0] })
}}
/>
}

Loading…
Cancel
Save