diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index f906e716..0357a94f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -251,33 +251,22 @@ export const startEndStation = { }, }; -// export const direction = { -// label: "方向:", -// key: "direction", -// required: true, -// type: "select", -// options: { -// options: [ -// // { key: "济南方向", label: "济南方向" }, -// // { key: "菏泽方向", label: "菏泽方向" }, -// ], -// }, -// }; - -export const direction = { - label: "路段方向:", - key: "direction", - type: "CheckboxGroup", - isAlone: true, - default: [], - options: { - options: [ - { key: "1", label: "济南方向" }, - { key: "3", label: "菏泽方向" }, - { key: "2", label: "双向" }, - ], - }, -}; +export function directionCreater(type){ + return { + label: "路段方向:", + key: "direction", + type, //CheckboxGroup 或 RadioGroup + isAlone: true, + default: [], + options: { + options: [ + { key: "1", label: "菏泽方向" }, + { key: "2", label: "双向" }, + { key: "3", label: "济南方向" }, + ], + }, + }; +} export const problemDescription = { label: "问题描述:", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js new file mode 100644 index 00000000..b28328d2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js @@ -0,0 +1,63 @@ +// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; +import * as PresetFormItems from "@screen/common/PresetFormItems.js"; +// import { merge, cloneDeep } from "lodash"; + +export const searchFormList = [ + { + 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.directionCreater("CheckboxGroup"), + { + label: "发布状态:", + key: "releaseStatus", + type: "checkboxGroup", + default: [], + options: { + options: [ + { + key: "1", + label: "成功", + }, + { + key: "0", + label: "失败", + }, + ], + }, + }, + + // { + // label: "内容:", + // key: "releaseContent", + // type: "input", + // default: "" + // }, + + // { + // ...PresetFormItems.station, + // label: "开始桩号:", + // required: false, + // }, + // merge(cloneDeep(PresetFormItems.station), { + // options: { + // options: [ + // { + // key: "endStakeMark[0]", + // }, + // { + // key: "endStakeMark[1]", + // }, + // ], + // }, + // label: "结束桩号:", + // required: false, + // }), +]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue index bd10cfeb..5817c53e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue @@ -2,8 +2,7 @@
-
- + @@ -16,7 +15,14 @@ 新增 --> -
+ +
@@ -30,7 +36,7 @@ - - - + + +