From 79b16965ece6d64af4307df9adcbadef5e0a04b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Thu, 22 Feb 2024 17:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=8F=E8=B0=83?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E8=AE=B0=E5=BD=95=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=97=A0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/common/PresetFormItems.js | 26 +++++++++++++++---- .../event/coordinateSchedulingRecords/data.js | 22 ++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/data.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index f40baffe..09ec829d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -205,15 +205,30 @@ export const startEndStation = { }, }; +// export const direction = { +// label: "方向:", +// key: "direction", +// required: true, +// type: "select", +// options: { +// options: [ +// // { key: "济南方向", label: "济南方向" }, +// // { key: "菏泽方向", label: "菏泽方向" }, +// ], +// }, +// }; + export const direction = { - label: "方向:", + label: "路段方向:", key: "direction", - required: true, - type: "select", + type: "CheckboxGroup", + isAlone: true, + default: [], options: { options: [ - // { key: "济南方向", label: "济南方向" }, - // { key: "菏泽方向", label: "菏泽方向" }, + { key: "1", label: "济南方向" }, + { key: "3", label: "菏泽方向" }, + { key: "2", label: "双向" }, ], }, }; @@ -290,6 +305,7 @@ export const eventLevel = { }, }; + export const laneOccupancy = { label: "车道占用:", key: "lang", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/data.js new file mode 100644 index 00000000..48d4cbc1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/data.js @@ -0,0 +1,22 @@ +import * as PresetFormItems from "@screen/common/PresetFormItems.js"; +import { merge, cloneDeep } from "lodash"; + +export const searchFormList = [ + PresetFormItems.eventType, + PresetFormItems.direction, + { + label: "时间范围:", + key: "daterange", + required: false, + type: "datePicker", + options: { + type: "daterange", + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + }, + PresetFormItems.startStation, + PresetFormItems.endStation + + +];