From aae11c5b8e114aab4258a88ce4c64d4bdd3bdf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 24 May 2024 19:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8E=E8=8D=B7BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialog/index.vue | 1 + .../components/HeaderMenu/WarningList.vue | 2 +- .../components/VideoMulti/index.vue | 3 + .../components/ConditionStatistics/index.vue | 3 - .../Dialogs/RoadNetworkFacilities/data.js | 46 +- .../Dialogs/RoadNetworkFacilities/index.vue | 27 +- .../Dialogs/TrafficIncidents/index.vue | 10 +- .../pages/Home/components/HomeFrame/index.vue | 8 +- .../components/HomeFrameControl/index.vue | 387 ++- .../Home/components/InfoBoard/InfoBoard.vue | 41 +- .../components/RoadAndEvents/utils/map.js | 18 +- .../strategy/components/AddNEditDialog.vue | 47 +- .../device/strategy/components/TaskItem.vue | 60 +- .../strategy/components/assets/editor.svg | 19 + .../DeviceControl/components/ScopeTable.vue | 50 +- .../Cards/DeviceControl/index copy.vue | 281 -- .../Cards/DeviceControl/index.vue | 60 +- .../index.vue | 0 .../Cards/DispatchLiaison/index.vue | 7 +- .../Cards/DisposalProcess/index.vue | 2 - .../EditEventInformationDialog/index.vue | 173 +- .../Cards/EventInformation/index.vue | 1 + .../Cards/RealTimeVideo/index.vue | 4 +- .../Cards/ReleaseInformation/index.vue | 16 +- .../AddControlEventInfoDialog/index.vue | 58 +- .../Cards/TrafficControl/index.vue | 6 +- .../control/event/commandDispatch/index.vue | 5 +- .../eventPlanDialog/index.vue | 1 - .../event/event/EventDetailDialog/index.vue | 138 +- .../control/event/event/FormEvent/data.js | 22 +- .../control/event/event/FormEvent/index.vue | 131 +- .../pages/control/event/event/index.vue | 7 +- .../plan/addAndEditDialog/ScopeTable.vue | 74 +- .../plan/addAndEditDialog/index copy.vue | 472 ---- .../event/plan/addAndEditDialog/index.vue | 102 +- .../smart/analysis/charts.js | 4 +- .../smart/analysis/index.vue | 6 +- .../eventDetection/statistics/index.vue | 3 +- .../utils/enum_event/PresetFormItems.js | 1228 +++++++++ .../JiHeExpressway/utils/enum_event/data.js | 2411 +++++++++++++++++ 40 files changed, 4515 insertions(+), 1419 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/assets/editor.svg delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index copy.vue rename ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/{StatsDialogVisible => StatsDialog}/index.vue (100%) delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index copy.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js create mode 100644 ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/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 59094591..5deb0555 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -105,6 +105,7 @@ export default { }, methods: { close() { + this.$emit('update:close') this.modelVisible = false; }, updateDialogVisible(bool) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue index c58436a6..624f7e99 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue @@ -121,7 +121,7 @@ export default { .then((result) => { if (result.code != 200) return; result.rows.forEach(item => { - item.remark = (item.occurrenceTime || '') + " " + (item.stakeMark || '') + " " + (item.direction || '') + " 发生" + (item.stringEventType || '') + "( " + (item.eventSubclass || '') + ")事件" + item.remark = (item.occurrenceTime || '') + " " + (item.stakeMark || '') + " " + (item.direction || '') + " 发生" + (item.stringEventType || '') + "( " + (item.eventSubclassName || '') + ")事件" // item.remark = item.stakeMark + " " + item.direction + " 发生" + item.stringEventType + "( " + item.eventSubclass + ")事件" }) this.tableData = result.rows; diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue index 43dac124..4d37f3ae 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue @@ -64,6 +64,9 @@ export default { this.$once("hook:beforeDestroy", () => this.player?.destroy()); }, methods: { + closeContrl(){ + this.controlDialogVisible =false + }, cameraChange() { const changeItem = find(this.urls, { iotDeviceId: this.cameraId }); this.dialogData = { ...changeItem, parseOtherConfig: changeItem.otherConfig && JSON.parse(changeItem.otherConfig) }; 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 1c35b157..6fc4f9b5 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 @@ -134,15 +134,12 @@ export default { this.$nextTick(() => { const myChart1 = echarts.init(this.$refs.carStatisticsEchartBox); myChart1.setOption(carStatistics); - console.log("charts", carStatistics); const myChart2 = echarts.init(this.$refs.focusStatisticsEchartBox); myChart2.setOption(focusStatistics); - console.log("charts", focusStatistics); const myChart3 = echarts.init(this.$refs.otherStatisticsEchartBox); myChart3.setOption(otherStatistics); - console.log("charts", otherStatistics); }); }); } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js index c69a6134..7ba7631a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js @@ -356,7 +356,51 @@ export const tabList = { ], }, ], - 7: [], + 7: [ + { + name: "基本信息", + key: "first", + labelWidth: "70px", + list: [ + { + label:"名称", + key: "facilityName", + gridColumn: "3" + }, + { + label: "方向", + key: "direction", + gridColumn: "3", + }, + { + label: "所属", + key: "districtName", + gridColumn: "3", + }, + { + label: "桩号", + key: "stakeMark", + gridColumn: "3", + }, + { + label: "经度", + key: "longitude", + gridColumn: "3", + }, + { + label: "纬度", + key: "latitude", + gridColumn: "3", + }, + { + label: "介绍", + key: "introduction", + gridColumn: "6", + }, + + ], + } + ], 8: [ { name: "基本信息", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue index 79ac3798..bd97a5f5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue @@ -1,8 +1,12 @@