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 594595e3..02c140c4 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 @@ -112,6 +112,7 @@ export const startEndStation = { color: "#3DE8FF", }, }, + key: "stakeMark[0]", }, { prefix: { @@ -120,6 +121,7 @@ export const startEndStation = { color: "#3DE8FF", }, }, + key: "stakeMark[1]", }, { prefix: { @@ -128,6 +130,7 @@ export const startEndStation = { color: "#3DE8FF", }, }, + key: "stakeMark[2]", }, { prefix: { @@ -136,6 +139,7 @@ export const startEndStation = { color: "#3DE8FF", }, }, + key: "stakeMark[3]", }, ], }, @@ -606,6 +610,10 @@ export const eventHappenTime = { key: "startTime", required: true, type: "datePicker", + options:{ + format: 'yyyy-MM-dd HH:mm:ss', + valueFormat: 'yyyy-MM-dd HH:mm:ss' + } }; export const aEstimatedReleaseTime = { 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 1b7bc563..1de5c75e 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 @@ -69,81 +69,6 @@ export const tabConfigList = [ ], }, }, - { - key: "TrafficCongestion", - label: "交通拥堵", - formConfig: { - formOptions: {}, - list: [ - { - label: "拥堵类型:", - key: "eventSubclass", - type: "RadioGroup", - isAlone: true, - required: true, - options: { - activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", - options: [ - { - key: "4-1", - label: "道路拥堵", - }, - { - key: "4-2", - label: "立交拥堵", - }, - { - key: "4-3", - label: "收费站拥堵", - }, - { - key: "4-4", - label: "服务区拥堵", - }, - ], - }, - }, - { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' }, - { ...PresetFormItems.isInTunnel, isAlone: true }, - { - label: "拥堵里程:", - key: "dcEventTrafficCongestion.congestionMileage", - required: true, - type: "MultipleLabelItem", - options: { - options: [ - { - suffix: { - text: "千米", - }, - type: "InputNumber", - }, - ], - }, - }, - { - label: "最大拥堵里程:", - key: "dcEventTrafficCongestion.maxCongestionMileage", - required: true, - type: "MultipleLabelItem", - options: { - options: [ - { - suffix: { - text: "千米", - }, - type: "InputNumber", - }, - ], - }, - }, - PresetFormItems.startTime, - PresetFormItems.expectedEndTime, - PresetFormItems.remark, - PresetFormItems.source, - ], - }, - }, { key: "TrafficControl", label: "交通管制", @@ -308,15 +233,13 @@ export const tabConfigList = [ }, }, { - key: "ServiceAreaAbnormal", - label: "服务区异常", + key: "TrafficCongestion", + label: "交通拥堵", formConfig: { - formOptions: { - column: 2, - }, + formOptions: {}, list: [ { - label: "异常分类:", + label: "拥堵类型:", key: "eventSubclass", type: "RadioGroup", isAlone: true, @@ -325,53 +248,56 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "8-1", - label: "封闭、暂停营业", + key: "4-1", + label: "道路拥堵", }, { - key: "8-2", - label: "重要设施停用", + key: "4-2", + label: "立交拥堵", }, { - key: "8-3", - label: "其他异常", + key: "4-3", + label: "收费站拥堵", + }, + { + key: "4-4", + label: "服务区拥堵", }, ], }, }, - PresetFormItems.freeway, - PresetFormItems.direction, + { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' }, + { ...PresetFormItems.isInTunnel, isAlone: true }, { - label: "服务区:", - key: "dcEventServiceArea.facilityId", - type: "select", - isAlone: true, + label: "拥堵里程:", + key: "dcEventTrafficCongestion.congestionMileage", required: true, + type: "MultipleLabelItem", options: { options: [ { - value: "选项1", - label: "黄金糕", + suffix: { + text: "千米", + }, + type: "InputNumber", + key: "dcEventTrafficCongestion.congestionMileage", }, ], }, }, { - label: "出入口:", - key: "dcEventServiceArea.exitsInlets", - type: "RadioGroup", - isAlone: true, + label: "最大拥堵里程:", + key: "dcEventTrafficCongestion.maxCongestionMileage", required: true, + type: "MultipleLabelItem", options: { - activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "1", - label: "出口", - }, - { - key: "2", - label: "入口", + suffix: { + text: "千米", + }, + type: "InputNumber", + key: "dcEventTrafficCongestion.maxCongestionMileage", }, ], }, @@ -384,25 +310,15 @@ export const tabConfigList = [ }, }, { - key: "OtherEvents", - label: "其他事件", + key: "IllegalOnRoad", + label: "非法上路", formConfig: { formOptions: { column: 2, }, list: [ - { - label: "事件说明:", - key: "eventSourceTips", - isAlone: true, - options: { - type: "textarea", - autosize: true, - maxlength: 150, - autosize: { minRows: 6, maxRows: 6 }, - showWordLimit: true, - }, - }, + PresetFormItems.illegalTriggeringType, + PresetFormItems.additionalNotes, PresetFormItems.freeway, PresetFormItems.direction, PresetFormItems.station, @@ -415,15 +331,15 @@ export const tabConfigList = [ }, }, { - key: "HiddenDangersEquipment", - label: "设施设备隐患", + key: "BarricadesCleared", + label: "路障清除", formConfig: { formOptions: { column: 2, }, list: [ { - label: "类型:", + label: "障碍物类型:", key: "eventSubclass", type: "RadioGroup", isAlone: true, @@ -432,45 +348,29 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "9-1", - label: "摄像机", - }, - { - key: "9-2", - label: "护栏", + key: "6-1", + label: "烟雾", }, { - key: "9-3", - label: "隔离栅", + key: "6-2", + label: "倒伏树木", }, { - key: "9-4", - label: "情报板", + key: "6-3", + label: "撒落物", }, { - key: "9-5", - label: "防眩板", + key: "6-4", + label: "动物", }, { - key: "9-6", + key: "6-5", label: "其他", }, ], }, }, - { - label: "设备补充说明:", - key: "eventSourceTips", - isAlone: true, - options: { - type: "textarea", - autosize: true, - maxlength: 150, - autosize: { minRows: 6, maxRows: 6 }, - showWordLimit: true, - }, - required: true, - }, + PresetFormItems.additionalNotes, PresetFormItems.freeway, PresetFormItems.direction, PresetFormItems.station, @@ -483,16 +383,16 @@ export const tabConfigList = [ }, }, { - key: "AbnormalWeather", - label: "异常天气", + key: "Construction", + label: "施工建设", formConfig: { formOptions: { column: 2, }, list: [ { - label: "异常天气:", - key: "eventSubclass", + label: "施工类型:", + key: "key0123", type: "RadioGroup", isAlone: true, required: true, @@ -500,86 +400,106 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "10-1", - label: "雨", - }, - { - key: "10-2", - label: "雪", - }, - { - key: "10-3", - label: "雾", + key: "养护施工类施工", + label: "养护施工类施工", }, { - key: "10-4", - label: "大风", + key: "工程建设类施工", + label: "工程建设类施工", }, + ], + }, + }, + { + label: "施工分类:", + key: "eventSubclass", + type: "RadioGroup", + isAlone: true, + required: true, + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ { - key: "10-5", - label: "低温寒潮", + key: "7-1", + label: "道路养护施工", }, { - key: "10-6", - label: "路面积雪", + key: "7-2", + label: "收费站养护施工", }, { - key: "10-7", - label: "路面结冰", + key: "7-3", + label: "服务区养护施工", }, { - key: "10-8", - label: "路面积水", + key: "7-4", + label: "枢纽立交匝道养护施工", }, { - key: "10-9", - label: "其他", + key: "7-5", + label: "地方道路养护施工", }, ], }, }, - { ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' }, - PresetFormItems.additionalNotes, - PresetFormItems.freeway, - PresetFormItems.direction, - PresetFormItems.startEndStation, { - label: "紧急级别:", - key: "dcEventAbnormalWeather.emergencyLevel", + label: "管制方式:", + key: "dcEventConstruction.controlMode", + type: "RadioGroup", + isAlone: true, required: true, - type: "select", options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - value: "1", - label: "一般", + key: "1", + label: "封闭", }, { - value: "2", - label: "紧急", + key: "2", + label: "不封闭", }, - ] - } + ], + }, }, PresetFormItems.isInTunnel, + { ...PresetFormItems.locationType, key: 'dcEventConstruction.locationType' }, + PresetFormItems.freeway, + PresetFormItems.direction, + PresetFormItems.station, + PresetFormItems.emptyLine, + { + label: "特殊地点描述:", + key: "dcEventConstruction.specialPlaceDescription", + isAlone: true, + options: { + type: "textarea", + autosize: true, + maxlength: 50, + autosize: { minRows: 6, maxRows: 6 }, + showWordLimit: true, + }, + }, + { ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' }, + { ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' }, PresetFormItems.startTime, PresetFormItems.expectedEndTime, - PresetFormItems.problemDescription, + PresetFormItems.remark, PresetFormItems.source, ], }, }, { - key: "Construction", - label: "施工建设", + key: "ServiceAreaAbnormal", + label: "服务区异常", formConfig: { formOptions: { column: 2, }, list: [ { - label: "施工类型:", - key: "key0123", + label: "异常分类:", + key: "eventSubclass", type: "RadioGroup", isAlone: true, required: true, @@ -587,51 +507,75 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "养护施工类施工", - label: "养护施工类施工", + key: "8-1", + label: "封闭、暂停营业", }, { - key: "工程建设类施工", - label: "工程建设类施工", + key: "8-2", + label: "重要设施停用", + }, + { + key: "8-3", + label: "其他异常", }, ], }, }, + PresetFormItems.freeway, + PresetFormItems.direction, { - label: "施工分类:", - key: "eventSubclass", - type: "RadioGroup", + label: "服务区:", + key: "dcEventServiceArea.facilityId", + type: "select", isAlone: true, required: true, options: { - activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "7-1", - label: "道路养护施工", - }, - { - key: "7-2", - label: "收费站养护施工", - }, - { - key: "7-3", - label: "服务区养护施工", + value: "选项1", + label: "黄金糕", }, + ], + }, + }, + { + label: "出入口:", + key: "dcEventServiceArea.exitsInlets", + type: "RadioGroup", + isAlone: true, + required: true, + options: { + activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", + options: [ { - key: "7-4", - label: "枢纽立交匝道养护施工", + key: "1", + label: "出口", }, { - key: "7-5", - label: "地方道路养护施工", + key: "2", + label: "入口", }, ], }, }, + PresetFormItems.startTime, + PresetFormItems.expectedEndTime, + PresetFormItems.remark, + PresetFormItems.source, + ], + }, + }, + { + key: "HiddenDangersEquipment", + label: "设施设备隐患", + formConfig: { + formOptions: { + column: 2, + }, + list: [ { - label: "管制方式:", - key: "dcEventConstruction.controlMode", + label: "类型:", + key: "eventSubclass", type: "RadioGroup", isAlone: true, required: true, @@ -639,53 +583,66 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "1", - label: "封闭", + key: "9-1", + label: "摄像机", }, { - key: "2", - label: "不封闭", + key: "9-2", + label: "护栏", + }, + { + key: "9-3", + label: "隔离栅", + }, + { + key: "9-4", + label: "情报板", + }, + { + key: "9-5", + label: "防眩板", + }, + { + key: "9-6", + label: "其他", }, ], }, }, - PresetFormItems.isInTunnel, - { ...PresetFormItems.locationType, key: 'dcEventConstruction.locationType' }, - PresetFormItems.freeway, - PresetFormItems.direction, - PresetFormItems.station, - PresetFormItems.emptyLine, { - label: "特殊地点描述:", - key: "dcEventConstruction.specialPlaceDescription", + label: "设备补充说明:", + key: "eventSourceTips", isAlone: true, options: { type: "textarea", autosize: true, - maxlength: 50, + maxlength: 150, autosize: { minRows: 6, maxRows: 6 }, showWordLimit: true, }, + required: true, }, - { ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' }, - { ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' }, + PresetFormItems.freeway, + PresetFormItems.direction, + PresetFormItems.station, + PresetFormItems.isInTunnel, PresetFormItems.startTime, PresetFormItems.expectedEndTime, - PresetFormItems.remark, + PresetFormItems.problemDescription, PresetFormItems.source, ], }, }, { - key: "BarricadesCleared", - label: "路障清除", + key: "AbnormalWeather", + label: "异常天气", formConfig: { formOptions: { column: 2, }, list: [ { - label: "障碍物类型:", + label: "异常天气:", key: "eventSubclass", type: "RadioGroup", isAlone: true, @@ -694,32 +651,67 @@ export const tabConfigList = [ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key: "6-1", - label: "烟雾", + key: "10-1", + label: "雨", }, { - key: "6-2", - label: "倒伏树木", + key: "10-2", + label: "雪", }, { - key: "6-3", - label: "撒落物", + key: "10-3", + label: "雾", }, { - key: "6-4", - label: "动物", + key: "10-4", + label: "大风", }, { - key: "6-5", + key: "10-5", + label: "低温寒潮", + }, + { + key: "10-6", + label: "路面积雪", + }, + { + key: "10-7", + label: "路面结冰", + }, + { + key: "10-8", + label: "路面积水", + }, + { + key: "10-9", label: "其他", }, ], }, }, + { ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' }, PresetFormItems.additionalNotes, PresetFormItems.freeway, PresetFormItems.direction, - PresetFormItems.station, + PresetFormItems.startEndStation, + { + label: "紧急级别:", + key: "dcEventAbnormalWeather.emergencyLevel", + required: true, + type: "select", + options: { + options: [ + { + value: "1", + label: "一般", + }, + { + value: "2", + label: "紧急", + }, + ] + } + }, PresetFormItems.isInTunnel, PresetFormItems.startTime, PresetFormItems.expectedEndTime, @@ -729,15 +721,25 @@ export const tabConfigList = [ }, }, { - key: "IllegalOnRoad", - label: "非法上路", + key: "OtherEvents", + label: "其他事件", formConfig: { formOptions: { column: 2, }, list: [ - PresetFormItems.illegalTriggeringType, - PresetFormItems.additionalNotes, + { + label: "事件说明:", + key: "eventSourceTips", + isAlone: true, + options: { + type: "textarea", + autosize: true, + maxlength: 150, + autosize: { minRows: 6, maxRows: 6 }, + showWordLimit: true, + }, + }, PresetFormItems.freeway, PresetFormItems.direction, PresetFormItems.station, @@ -749,4 +751,6 @@ export const tabConfigList = [ ], }, }, + + ]; 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 25bfd6a3..09c5b7ff 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 @@ -11,7 +11,7 @@
- +
@@ -22,6 +22,7 @@ import Dialog from "@screen/components/Dialog/index"; import Form from '@screen/components/FormConfig'; import Button from '@screen/components/Buttons/Button.vue'; import request from '@/utils/request' +import { Message } from "element-ui"; import { tabConfigList } from "./data.js" @@ -68,6 +69,7 @@ export default { }, methods: { handleChange({ index }) { + console.log('index',index) this.index = index; this.formConfig = tabConfigList[index].formConfig; }, @@ -75,7 +77,7 @@ export default { const formData = this.$refs.FormConfigRef?.formData; let stakeMark = formData.stakeMark; console.log('122', { - eventType: this.index, + eventType: Number(this.index) + 1, ...formData, stakeMark: stakeMark.length > 0 ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '' }) @@ -84,12 +86,14 @@ export default { url: `/dc/system/event`, method: "post", data: { - eventType: this.index, - ...formData + eventType: Number(this.index) + 1, + ...formData, + stakeMark: stakeMark.length > 0 ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '' } }) .then(() => { Message.success("提交成功"); + this.modelVisible = false; }) .catch(() => { Message.error("提交失败");