From 2d9b2cddcf494e3d6e230666bd7dc6d4bd07451d Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Mon, 22 Jan 2024 10:03:48 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialog/index.vue | 18 +- .../components/FormConfig/index.vue | 1 + .../components/TimeLine/TimeLine2/index.vue | 1 + .../components/ConditionStatistics/index.vue | 2 +- .../Home/components/RoadAndEvents/index.vue | 49 +- .../components/RoadAndEvents/utils/data.json | 464 ++++++++++++++++++ .../views/firstResponders/data.js | 20 + .../views/firstResponders/index.vue | 4 +- .../Cards/DisposalProcess/index.vue | 3 +- .../event/event/EventDetailDialog/index.vue | 9 +- .../control/event/event/FormEvent/index.vue | 4 +- .../views/JiHeExpressway/scss/el-reset.scss | 3 +- 12 files changed, 544 insertions(+), 34 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index b1584042..3bbe6885 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -17,6 +17,10 @@ + +
+ +
@@ -127,7 +131,7 @@ export default { } .dialog-content { - padding: 10px 20px 20px 20px; + padding: 9px 21px 21px 21px; max-height: 96vh; } @@ -136,5 +140,17 @@ export default { right: 0; bottom: 0; } + + .footer { + display: flex; + align-items: center; + gap: 9px; + width: 100%; + justify-content: flex-end; + margin-bottom: 21px; + padding: 0 36px; + // padding: 21px 36px; + // padding-top: 9px; + } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue index 07287a86..5f3ea299 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue @@ -171,6 +171,7 @@ export default { width: 100%; gap: 15px 15px; overflow-x: hidden; + padding-right: 9px; .formItem { display: flex; diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue index db664bd7..3cb6cf82 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue @@ -79,6 +79,7 @@ export default { color: #fff; overflow-y: auto; height: 100%; + padding-right: 9px; .node { width: 100%; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue index 36e17ca3..10d82fc8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue @@ -544,7 +544,7 @@ export default { text-shadow: 0px 1px 4px #f29600; .num { - font-size: 10px; + // font-size: 10px; } .unit { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index e4ebc614..d3358652 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -30,9 +30,6 @@ - - - @@ -55,31 +52,31 @@ export default { DrivingGuidance, InfoBoard, Bg1 -}, + }, data() { return { - testData:{ - visible:true, - device: { - "id": 904, - "iotDeviceId": "81221-65535", - "groupId": null, - "productId": 0, - "stakeMarkId": "k59+289", - "direction": "1", - "deviceName": "大学城入口站前板", - "deviceType": 2, - "installationDate": null, - "productionDate": null, - "durableYears": null, - "installationSite": null, - "useState": null, - "otherConfig": "{\"screenSize\":\"160*80\"}", - "remark": null, - "createTime": "2024-01-10T15:48:59.000+08:00", - "updateTime": null - } - }, + // testData:{ + // visible:true, + // device: { + // "id": 904, + // "iotDeviceId": "81221-65535", + // "groupId": null, + // "productId": 0, + // "stakeMarkId": "k59+289", + // "direction": "1", + // "deviceName": "大学城入口站前板", + // "deviceType": 2, + // "installationDate": null, + // "productionDate": null, + // "durableYears": null, + // "installationSite": null, + // "useState": null, + // "otherConfig": "{\"screenSize\":\"160*80\"}", + // "remark": null, + // "createTime": "2024-01-10T15:48:59.000+08:00", + // "updateTime": null + // } + // }, layerData: [], active: "事件专题", tabContentData: [], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json new file mode 100644 index 00000000..6782a0fa --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json @@ -0,0 +1,464 @@ +[ + { + "id": 1882, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K60+000—K65+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1883, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K75+000—K81+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1884, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K101+000—K104+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1885, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K110+000—K112+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1886, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K147+000—K152+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1887, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K162+000—K166+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1888, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K205+000—K207+000", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1889, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K59+290", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1890, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K72+844", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1891, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K83+885", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1892, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K86+499", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1893, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K99+750", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1894, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K105+904", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1895, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K117+878", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1896, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K126+224", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1897, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K145+934", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1898, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K155+652", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1899, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K163+250", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1900, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K173+600", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1901, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K179+140", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": null, + "latitude": null + }, + { + "id": 1902, + "iotDeviceId": null, + "groupId": null, + "productId": 285, + "stakeMarkId": "K190+500", + "direction": null, + "deviceName": "智能行车诱导系统", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": "2024-01-17T22:50:56.000+08:00", + "updateTime": null, + "longitude": "116.147183", + "latitude": "35.612834" + }, + { + "id": 99999, + "iotDeviceId": null, + "groupId": null, + "productId": 286, + "stakeMarkId": "k59+289", + "direction": "2", + "deviceName": "不知", + "deviceType": 12, + "installationDate": null, + "productionDate": null, + "durableYears": null, + "installationSite": null, + "useState": null, + "otherConfig": null, + "remark": null, + "createTime": null, + "updateTime": null, + "longitude": null, + "latitude": null + } +] \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js new file mode 100644 index 00000000..3cb25cff --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/data.js @@ -0,0 +1,20 @@ +// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; + +export const searchFormList = [ + { + label: "岗位:", + key: "key009", + type: "select", + options: { + type: "daterange", + }, + }, + { + label: "驻点:", + key: "key018", + type: "select", + options: { + type: "daterange", + }, + }, +]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue index 9a8cacc9..a94333cc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue @@ -22,7 +22,7 @@ - +
@@ -35,6 +35,7 @@ import PeopleCard from "./../../components/PeopleCard/index.vue"; import InputSearch from '@screen/components/InputSearch/index.vue'; import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue'; +import { searchFormList } from "./data"; export default { name: 'FirstResponders', @@ -45,6 +46,7 @@ export default { }, data() { return { + searchFormList } } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue index a97d0917..384a796c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue @@ -29,7 +29,7 @@
- + 发送 @@ -63,6 +63,7 @@ export default { emit: ['fullHeight'], data() { return { + test: null, timeLine1List, // timeLine2List: Array.from({ length: 6 }).map(() => ({ // title: "接警记录", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index d7e03549..39684805 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -11,7 +11,12 @@ +
+ @@ -24,6 +29,7 @@ import { formList, timeLine1List } from "./data" import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js" import Video from "@screen/components/Video"; import Carousel from "./Carousel/index.vue" +import Button from '@screen/components/Buttons/Button.vue'; export default { name: 'EventDetail', @@ -33,7 +39,8 @@ export default { TimeLine1, TimeLine2, Video, - Carousel + Carousel, + Button }, model: { prop: 'visible', diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue index b09c346d..e54e8c84 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue @@ -10,8 +10,8 @@
- - + +
diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss index 7a615d25..31358447 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss +++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss @@ -260,7 +260,8 @@ div.el-picker-panel.el-date-range-picker.el-popper { } } - .current span { + .current span, + .current a { background-color: #56cefe; } td.in-range div {