mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改新增事件接口

wangqin
zhoule 1 year ago
parent
2e69a5d876
commit
ef69292aa4
3 changed files with 271 additions and 255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
  2. 506
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
  3. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue

8
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
View File

@ -112,6 +112,7 @@ export const startEndStation = {
color: "#3DE8FF", color: "#3DE8FF",
}, },
}, },
key: "stakeMark[0]",
}, },
{ {
prefix: { prefix: {
@ -120,6 +121,7 @@ export const startEndStation = {
color: "#3DE8FF", color: "#3DE8FF",
}, },
}, },
key: "stakeMark[1]",
}, },
{ {
prefix: { prefix: {
@ -128,6 +130,7 @@ export const startEndStation = {
color: "#3DE8FF", color: "#3DE8FF",
}, },
}, },
key: "stakeMark[2]",
}, },
{ {
prefix: { prefix: {
@ -136,6 +139,7 @@ export const startEndStation = {
color: "#3DE8FF", color: "#3DE8FF",
}, },
}, },
key: "stakeMark[3]",
}, },
], ],
}, },
@ -606,6 +610,10 @@ export const eventHappenTime = {
key: "startTime", key: "startTime",
required: true, required: true,
type: "datePicker", type: "datePicker",
options:{
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss'
}
}; };
export const aEstimatedReleaseTime = { export const aEstimatedReleaseTime = {

506
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
View File

@ -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", key: "TrafficControl",
label: "交通管制", label: "交通管制",
@ -308,15 +233,13 @@ export const tabConfigList = [
}, },
}, },
{ {
key: "ServiceAreaAbnormal", key: "TrafficCongestion",
label: "服务区异常", label: "交通拥堵",
formConfig: { formConfig: {
formOptions: { formOptions: {},
column: 2,
},
list: [ list: [
{ {
label: "异常分类:", label: "拥堵类型:",
key: "eventSubclass", key: "eventSubclass",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
@ -325,53 +248,56 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "8-1", key: "4-1",
label: "封闭、暂停营业", label: "道路拥堵",
}, },
{ {
key: "8-2", key: "4-2",
label: "重要设施停用", label: "立交拥堵",
}, },
{ {
key: "8-3", key: "4-3",
label: "其他异常", label: "收费站拥堵",
},
{
key: "4-4",
label: "服务区拥堵",
}, },
], ],
}, },
}, },
PresetFormItems.freeway, { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' },
PresetFormItems.direction, { ...PresetFormItems.isInTunnel, isAlone: true },
{ {
label: "服务区:", label: "拥堵里程:",
key: "dcEventServiceArea.facilityId", key: "dcEventTrafficCongestion.congestionMileage",
type: "select",
isAlone: true,
required: true, required: true,
type: "MultipleLabelItem",
options: { options: {
options: [ options: [
{ {
value: "选项1", suffix: {
label: "黄金糕", text: "千米",
},
type: "InputNumber",
key: "dcEventTrafficCongestion.congestionMileage",
}, },
], ],
}, },
}, },
{ {
label: "出入口:", label: "最大拥堵里程:",
key: "dcEventServiceArea.exitsInlets", key: "dcEventTrafficCongestion.maxCongestionMileage",
type: "RadioGroup",
isAlone: true,
required: true, required: true,
type: "MultipleLabelItem",
options: { options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "1", suffix: {
label: "出口", text: "千米",
}, },
{ type: "InputNumber",
key: "2", key: "dcEventTrafficCongestion.maxCongestionMileage",
label: "入口",
}, },
], ],
}, },
@ -384,25 +310,15 @@ export const tabConfigList = [
}, },
}, },
{ {
key: "OtherEvents", key: "IllegalOnRoad",
label: "其他事件", label: "非法上路",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ list: [
{ PresetFormItems.illegalTriggeringType,
label: "事件说明:", PresetFormItems.additionalNotes,
key: "eventSourceTips",
isAlone: true,
options: {
type: "textarea",
autosize: true,
maxlength: 150,
autosize: { minRows: 6, maxRows: 6 },
showWordLimit: true,
},
},
PresetFormItems.freeway, PresetFormItems.freeway,
PresetFormItems.direction, PresetFormItems.direction,
PresetFormItems.station, PresetFormItems.station,
@ -415,15 +331,15 @@ export const tabConfigList = [
}, },
}, },
{ {
key: "HiddenDangersEquipment", key: "BarricadesCleared",
label: "设施设备隐患", label: "路障清除",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ list: [
{ {
label: "类型:", label: "障碍物类型:",
key: "eventSubclass", key: "eventSubclass",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
@ -432,45 +348,29 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "9-1", key: "6-1",
label: "摄像机", label: "烟雾",
},
{
key: "9-2",
label: "护栏",
}, },
{ {
key: "9-3", key: "6-2",
label: "隔离栅", label: "倒伏树木",
}, },
{ {
key: "9-4", key: "6-3",
label: "情报板", label: "撒落物",
}, },
{ {
key: "9-5", key: "6-4",
label: "防眩板", label: "动物",
}, },
{ {
key: "9-6", key: "6-5",
label: "其他", label: "其他",
}, },
], ],
}, },
}, },
{ PresetFormItems.additionalNotes,
label: "设备补充说明:",
key: "eventSourceTips",
isAlone: true,
options: {
type: "textarea",
autosize: true,
maxlength: 150,
autosize: { minRows: 6, maxRows: 6 },
showWordLimit: true,
},
required: true,
},
PresetFormItems.freeway, PresetFormItems.freeway,
PresetFormItems.direction, PresetFormItems.direction,
PresetFormItems.station, PresetFormItems.station,
@ -483,16 +383,16 @@ export const tabConfigList = [
}, },
}, },
{ {
key: "AbnormalWeather", key: "Construction",
label: "异常天气", label: "施工建设",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ list: [
{ {
label: "异常天气:", label: "施工类型:",
key: "eventSubclass", key: "key0123",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
required: true, required: true,
@ -500,86 +400,106 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "10-1", key: "养护施工类施工",
label: "雨", label: "养护施工类施工",
},
{
key: "10-2",
label: "雪",
},
{
key: "10-3",
label: "雾",
}, },
{ {
key: "10-4", key: "工程建设类施工",
label: "大风", label: "工程建设类施工",
}, },
],
},
},
{
label: "施工分类:",
key: "eventSubclass",
type: "RadioGroup",
isAlone: true,
required: true,
options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [
{ {
key: "10-5", key: "7-1",
label: "低温寒潮", label: "道路养护施工",
}, },
{ {
key: "10-6", key: "7-2",
label: "路面积雪", label: "收费站养护施工",
}, },
{ {
key: "10-7", key: "7-3",
label: "路面结冰", label: "服务区养护施工",
}, },
{ {
key: "10-8", key: "7-4",
label: "路面积水", label: "枢纽立交匝道养护施工",
}, },
{ {
key: "10-9", key: "7-5",
label: "其他", label: "地方道路养护施工",
}, },
], ],
}, },
}, },
{ ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' },
PresetFormItems.additionalNotes,
PresetFormItems.freeway,
PresetFormItems.direction,
PresetFormItems.startEndStation,
{ {
label: "紧急级别:", label: "管制方式:",
key: "dcEventAbnormalWeather.emergencyLevel", key: "dcEventConstruction.controlMode",
type: "RadioGroup",
isAlone: true,
required: true, required: true,
type: "select",
options: { options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
value: "1", key: "1",
label: "一般", label: "封闭",
}, },
{ {
value: "2", key: "2",
label: "紧急", label: "不封闭",
}, },
] ],
} },
}, },
PresetFormItems.isInTunnel, 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.startTime,
PresetFormItems.expectedEndTime, PresetFormItems.expectedEndTime,
PresetFormItems.problemDescription, PresetFormItems.remark,
PresetFormItems.source, PresetFormItems.source,
], ],
}, },
}, },
{ {
key: "Construction", key: "ServiceAreaAbnormal",
label: "施工建设", label: "服务区异常",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ list: [
{ {
label: "施工类型:", label: "异常分类:",
key: "key0123", key: "eventSubclass",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
required: true, required: true,
@ -587,51 +507,75 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "养护施工类施工", key: "8-1",
label: "养护施工类施工", label: "封闭、暂停营业",
}, },
{ {
key: "工程建设类施工", key: "8-2",
label: "工程建设类施工", label: "重要设施停用",
},
{
key: "8-3",
label: "其他异常",
}, },
], ],
}, },
}, },
PresetFormItems.freeway,
PresetFormItems.direction,
{ {
label: "施工分类:", label: "服务区:",
key: "eventSubclass", key: "dcEventServiceArea.facilityId",
type: "RadioGroup", type: "select",
isAlone: true, isAlone: true,
required: true, required: true,
options: { options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "7-1", value: "选项1",
label: "道路养护施工", label: "黄金糕",
},
{
key: "7-2",
label: "收费站养护施工",
},
{
key: "7-3",
label: "服务区养护施工",
}, },
],
},
},
{
label: "出入口:",
key: "dcEventServiceArea.exitsInlets",
type: "RadioGroup",
isAlone: true,
required: true,
options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [
{ {
key: "7-4", key: "1",
label: "枢纽立交匝道养护施工", label: "出口",
}, },
{ {
key: "7-5", key: "2",
label: "地方道路养护施工", label: "入口",
}, },
], ],
}, },
}, },
PresetFormItems.startTime,
PresetFormItems.expectedEndTime,
PresetFormItems.remark,
PresetFormItems.source,
],
},
},
{
key: "HiddenDangersEquipment",
label: "设施设备隐患",
formConfig: {
formOptions: {
column: 2,
},
list: [
{ {
label: "管制方式:", label: "类型:",
key: "dcEventConstruction.controlMode", key: "eventSubclass",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
required: true, required: true,
@ -639,53 +583,66 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "1", key: "9-1",
label: "封闭", label: "摄像机",
}, },
{ {
key: "2", key: "9-2",
label: "不封闭", 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: "特殊地点描述:", label: "设备补充说明:",
key: "dcEventConstruction.specialPlaceDescription", key: "eventSourceTips",
isAlone: true, isAlone: true,
options: { options: {
type: "textarea", type: "textarea",
autosize: true, autosize: true,
maxlength: 50, maxlength: 150,
autosize: { minRows: 6, maxRows: 6 }, autosize: { minRows: 6, maxRows: 6 },
showWordLimit: true, showWordLimit: true,
}, },
required: true,
}, },
{ ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' }, PresetFormItems.freeway,
{ ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' }, PresetFormItems.direction,
PresetFormItems.station,
PresetFormItems.isInTunnel,
PresetFormItems.startTime, PresetFormItems.startTime,
PresetFormItems.expectedEndTime, PresetFormItems.expectedEndTime,
PresetFormItems.remark, PresetFormItems.problemDescription,
PresetFormItems.source, PresetFormItems.source,
], ],
}, },
}, },
{ {
key: "BarricadesCleared", key: "AbnormalWeather",
label: "路障清除", label: "异常天气",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ list: [
{ {
label: "障碍物类型:", label: "异常天气:",
key: "eventSubclass", key: "eventSubclass",
type: "RadioGroup", type: "RadioGroup",
isAlone: true, isAlone: true,
@ -694,32 +651,67 @@ export const tabConfigList = [
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [ options: [
{ {
key: "6-1", key: "10-1",
label: "烟雾", label: "雨",
}, },
{ {
key: "6-2", key: "10-2",
label: "倒伏树木", label: "雪",
}, },
{ {
key: "6-3", key: "10-3",
label: "撒落物", label: "雾",
}, },
{ {
key: "6-4", key: "10-4",
label: "动物", label: "大风",
}, },
{ {
key: "6-5", key: "10-5",
label: "低温寒潮",
},
{
key: "10-6",
label: "路面积雪",
},
{
key: "10-7",
label: "路面结冰",
},
{
key: "10-8",
label: "路面积水",
},
{
key: "10-9",
label: "其他", label: "其他",
}, },
], ],
}, },
}, },
{ ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' },
PresetFormItems.additionalNotes, PresetFormItems.additionalNotes,
PresetFormItems.freeway, PresetFormItems.freeway,
PresetFormItems.direction, 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.isInTunnel,
PresetFormItems.startTime, PresetFormItems.startTime,
PresetFormItems.expectedEndTime, PresetFormItems.expectedEndTime,
@ -729,15 +721,25 @@ export const tabConfigList = [
}, },
}, },
{ {
key: "IllegalOnRoad", key: "OtherEvents",
label: "非法上路", label: "其他事件",
formConfig: { formConfig: {
formOptions: { formOptions: {
column: 2, column: 2,
}, },
list: [ 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.freeway,
PresetFormItems.direction, PresetFormItems.direction,
PresetFormItems.station, PresetFormItems.station,
@ -749,4 +751,6 @@ export const tabConfigList = [
], ],
}, },
}, },
]; ];

12
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
View File

@ -11,7 +11,7 @@
<div class="footer"> <div class="footer">
<Button style="padding:0 24px;" @click.native="handleSubmit" >保存</Button> <Button style="padding:0 24px;" @click.native="handleSubmit" >保存</Button>
<Button style="background: #C9C9C9;padding:0 24px;">取消</Button> <Button style="background: #C9C9C9;padding:0 24px;" @click.native="modelVisible = false">取消</Button>
</div> </div>
</div> </div>
</Dialog> </Dialog>
@ -22,6 +22,7 @@ import Dialog from "@screen/components/Dialog/index";
import Form from '@screen/components/FormConfig'; import Form from '@screen/components/FormConfig';
import Button from '@screen/components/Buttons/Button.vue'; import Button from '@screen/components/Buttons/Button.vue';
import request from '@/utils/request' import request from '@/utils/request'
import { Message } from "element-ui";
import { tabConfigList } from "./data.js" import { tabConfigList } from "./data.js"
@ -68,6 +69,7 @@ export default {
}, },
methods: { methods: {
handleChange({ index }) { handleChange({ index }) {
console.log('index',index)
this.index = index; this.index = index;
this.formConfig = tabConfigList[index].formConfig; this.formConfig = tabConfigList[index].formConfig;
}, },
@ -75,7 +77,7 @@ export default {
const formData = this.$refs.FormConfigRef?.formData; const formData = this.$refs.FormConfigRef?.formData;
let stakeMark = formData.stakeMark; let stakeMark = formData.stakeMark;
console.log('122', { console.log('122', {
eventType: this.index, eventType: Number(this.index) + 1,
...formData, ...formData,
stakeMark: stakeMark.length > 0 ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '' stakeMark: stakeMark.length > 0 ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : ''
}) })
@ -84,12 +86,14 @@ export default {
url: `/dc/system/event`, url: `/dc/system/event`,
method: "post", method: "post",
data: { data: {
eventType: this.index, eventType: Number(this.index) + 1,
...formData ...formData,
stakeMark: stakeMark.length > 0 ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : ''
} }
}) })
.then(() => { .then(() => {
Message.success("提交成功"); Message.success("提交成功");
this.modelVisible = false;
}) })
.catch(() => { .catch(() => {
Message.error("提交失败"); Message.error("提交失败");

Write Preview
Loading…
Cancel
Save