diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Title/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Title/index.vue index 6b75a498..e89eeb17 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Title/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Title/index.vue @@ -34,8 +34,10 @@ export default { background-image: url(./images/bg.svg); background-repeat: no-repeat; background-size: auto; - font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + .left { + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + } >div { display: flex; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue index a4356d9b..521093ec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue @@ -29,6 +29,7 @@ import Button from '@screen/components/Buttons/Button.vue'; import Form from '@screen/components/FormConfig'; import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; +import { merge, cloneDeep } from "lodash" export default { name: 'HomeFilter', @@ -40,24 +41,88 @@ export default { return { activeIcon: null, formList: [ - { - ...PresetFormItems.station, - key: "23", + merge(cloneDeep(PresetFormItems.station), { required: false, - label: "起始桩号" - }, - { - ...PresetFormItems.station, - key: "s", + label: "起始桩号:", + options: { + options: [ + { + rules: [ + { + message: "请补全桩号", + callback(value, data) { + if (!value?.trim() && data.startStakeMark[1]?.trim()) + return false; + else return true; + }, + }, + ], + key: "startStakeMark[0]", + }, + { + rules: [ + { + message: "请补全桩号", + callback(value, data) { + if (!value?.trim() && data.startStakeMark[0]?.trim()) + return false; + else return true; + }, + }, + ], + key: "startStakeMark[1]", + }, + ], + }, + }), + merge(cloneDeep(PresetFormItems.station), { required: false, - label: "结束桩号" - } + label: "结束桩号:", + options: { + options: [ + { + rules: [ + { + message: "请补全桩号", + callback(value, data) { + if (!value?.trim() && data.endStakeMark[1]?.trim()) + return false; + else return true; + }, + }, + ], + key: "endStakeMark[0]", + }, + { + rules: [ + { + message: "请补全桩号", + callback(value, data) { + if (!value?.trim() && data.endStakeMark[0]?.trim()) + return false; + else return true; + }, + }, + ], + key: "endStakeMark[1]", + }, + ], + }, + }), ] } }, methods: { handleClick(type) { this.activeIcon = this.activeIcon === type ? null : type; + }, + async handleResetForm() { + this.$refs.FormConfigRef?.reset(); + this.activeIcon = null; + }, + async handleSearch() { + const data = await this.$refs.FormConfigRef.validate(); + this.activeIcon = null; } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index bee6ec5c..472659d4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -173,7 +173,7 @@ const DeviceTypeMap = { 13: "智能设备箱", 14: "光线在线监测", */ -export function getDeviceList(deviceType) { +export function getDeviceList(deviceType, options) { return new Promise((resolve, reject) => { if (!deviceType) { Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`); @@ -185,6 +185,7 @@ export function getDeviceList(deviceType) { method: "get", params: { deviceType, + ...options, }, }) .then(({ code, data }) => {