diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js index d6bf0b22..89b43a73 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js @@ -714,7 +714,7 @@ export const route = { export const eventHappenTime = { label: "事件发生时间:", - key: "startTime", + key: "occurrenceTime", required: true, type: "datePicker", options:{ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js index dc0c69ef..929d287b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js @@ -8,7 +8,7 @@ export const tabConfigList = [ list: [ { ...PresetFormItems.callPolicePersonName, key: 'dcEventAccident.reporterName' }, { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventAccident.reporterPhoneNumber' }, - PresetFormItems.trafficAccidentType, + { ...PresetFormItems.trafficAccidentType, key: 'dcEventAccident.accidentType' }, PresetFormItems.eventLevel, { ...PresetFormItems.locationMode, key: 'dcEventAccident.locationType' }, PresetFormItems.freeway, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue index 8a5f74e2..8f219e30 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue @@ -154,10 +154,14 @@ export default { if (this.index == 1) { formData.dcEventVehicleAccident.laneOccupancy = formData.dcEventVehicleAccident.laneOccupancy.join(',') } - // console.log('formData',formData) - // return; + if (this.index == 8) { + let endStakeMark = formData.endStakeMark; + formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : ''; + } + console.log('formData',formData) + return; let stakeMark = formData.stakeMark; - let endStakeMark = formData.endStakeMark; + request({ url: `/dc/system/event`, method: "post", @@ -165,7 +169,6 @@ export default { ...formData, eventType: Number(this.index) + 1, stakeMark: (stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '', - endStakeMark: (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '', } }) .then((result) => {