diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue index 9812d198..70e04ddf 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue @@ -96,6 +96,7 @@ export default { qbb: '' }], planName: '', + automaticInfo: {}, dcExecuteAction: [], deviceData: [], eventOptions: [ @@ -252,16 +253,32 @@ export default { return this.deviceData; }, async getTemplateAutomatic() { - request({ - url: `/business/plans/event/automatic`, + let url = ''; + let data = {}; + let plan = this.info.find(it => it.planName == this.planName); + if (this.activeName == '-1') {//感知 + url = '/business/plans/warning/confirm'; + data = { + dcEmergencyPlans: plan, + dcWarning: this.eventFormData + } + } else {//交通 + url = '/business/plans/event/automatic'; + data = { + dcEmergencyPlans: plan, + dcEvent: this.eventFormData + } + } + const result = await request({ + url: url, method: "post", - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.sbOptions = result.data; - - }).catch(() => { - Message.error("查询可变信息标识失败"); + data: data }) + if (result.code != 200) { + Message.error(result?.msg); + return {}; + } + return result.data; }, changeRadio(value) { let plan = this.info.find(it => it.planName == value); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue index c71effe3..1733abc2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue @@ -87,7 +87,8 @@ - + @@ -95,7 +96,7 @@ import Table from '@screen/components/Table.vue'; import Button from '@screen/components/Buttons/Button.vue'; import request from "@/utils/request"; -import QbbDialog from "../qbbDialog/index.vue"; +// import QbbDialog from "../qbbDialog/index.vue"; import { Message } from 'element-ui' import { planDeviceOptions } from "@screen/utils/enum.js"; @@ -105,15 +106,14 @@ export default { components: { Button, Table, - QbbDialog - }, - model: { - prop: 'visible', - event: 'update:value' + // QbbDialog }, + // model: { + // prop: 'visible', + // event: 'update:value' + // }, inject: ['loadData'], props: { - visible: Boolean, eventType: Number, type: Number, tableData: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue index 78e2c569..e0348eae 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue @@ -1,11 +1,11 @@