From 7d0f0895032e3eda7f763d774857e9e6ea9a50eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 26 Apr 2024 22:13:46 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/perception/topology/index.vue | 6 +++--- .../pages/perception/topology/t010.svg | 14 ++++++++++++++ .../pages/perception/topology/t011.svg | 13 +++++++++++++ .../pages/perception/topology/t013.svg | 9 +++++++++ .../pages/perception/topology/t03.svg | 12 ++++++++++++ .../pages/perception/topology/t05.svg | 9 +++++++++ .../pages/perception/topology/t06.svg | 7 +++++++ .../pages/perception/topology/t07.svg | 13 +++++++++++++ .../pages/perception/topology/t08.svg | 7 +++++++ .../pages/perception/topology/t110.svg | 14 ++++++++++++++ .../pages/perception/topology/t111.svg | 13 +++++++++++++ .../pages/perception/topology/t113.svg | 9 +++++++++ .../pages/perception/topology/t13.svg | 12 ++++++++++++ .../pages/perception/topology/t15.svg | 9 +++++++++ .../pages/perception/topology/t16.svg | 7 +++++++ .../pages/perception/topology/t17.svg | 13 +++++++++++++ .../pages/perception/topology/t18.svg | 7 +++++++ .../Cards/AuditLists/index.vue | 7 ++++++- ruoyi-ui/src/views/JiHeExpressway/utils/enum.js | 15 ++++++++++++++- ruoyi-ui/vue.config.js | 4 ++-- 20 files changed, 193 insertions(+), 7 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t010.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue index e14eee93..cc81d7bb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue @@ -139,7 +139,7 @@ placement="top-end" >
{{ itm.switchName }}({{ index + 1 }}) @@ -161,9 +161,9 @@ >
- + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg new file mode 100644 index 00000000..3398045f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t011.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg new file mode 100644 index 00000000..ebbfa096 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t013.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg new file mode 100644 index 00000000..098e3891 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t03.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg new file mode 100644 index 00000000..37d7fafa --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t05.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg new file mode 100644 index 00000000..3c456b5b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t06.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg new file mode 100644 index 00000000..88956587 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t07.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg new file mode 100644 index 00000000..b8a0fb74 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t08.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg new file mode 100644 index 00000000..1bc151f2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t110.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg new file mode 100644 index 00000000..ab78d112 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t111.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg new file mode 100644 index 00000000..9153ba7d --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t113.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg new file mode 100644 index 00000000..004e6dae --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t13.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg new file mode 100644 index 00000000..d7257ba0 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t15.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg new file mode 100644 index 00000000..3fe901c7 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t16.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg new file mode 100644 index 00000000..d51bee05 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t17.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg new file mode 100644 index 00000000..ee4a466b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t18.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue index ba4fd1e8..712af6fd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue @@ -74,7 +74,11 @@ export default { p['eventState']= e.eventState } if(e.eventType){ - p['eventState']= e.eventState + p['eventType']= e.eventType + } + if(e.daterange && e.daterange.length === 2){ + p['startTime']= e.daterange[0] + p['endTime']= e.daterange[1] } if(e.startStakeMark && e.startStakeMark.length === 2){ p['startStakeMarkValue']= `K${e.startStakeMark[0]}+${e.startStakeMark[1]}` @@ -83,6 +87,7 @@ export default { p['endStakeMarkValue']= `K${e.endStakeMark[0]}+${e.endStakeMark[1]}` } this.p = p; + console.log(p,333) this.list = []; this.bindList() }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index 75dae65a..e4015536 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -1057,7 +1057,20 @@ export const EventSubclass = { "8-3": "服务区其他异常", "9-1": "摄像机", "9-2": "护栏", - "9-3": "隔离栅" + "9-3": "隔离栅", + "9-4": "情报板", + "9-5": "防炫板", + "9-6": "其他", + "10-1": "雨", + "10-2": "雪", + "10-3":"雾", + "10-4":"大风", + "10-5":"低温寒潮", + "10-6":"路面积雪", + "10-7":"路面结冰", + "10-8":"路面积水", + "10-9":"其他", + "11-1":"其他事件" }; export const directionOptions = [ { value: "1", label: "菏泽方向" }, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 35bf9094..59319d90 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -53,8 +53,8 @@ module.exports = { // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - // target: `http://10.168.68.42:8087`, //王思祥 - target: `http://10.168.72.174:8087`, //赵祥龙 + target: `http://10.168.68.42:8087`, //王思祥 + // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟 // target: `http://10.168.56.165:8087`, //王家宝 // target: `http://10.168.77.128:8087`, //王兴琳 From 402e7657724e9d3e348bc2722d28e6c578c7b640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 26 Apr 2024 22:20:25 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E7=9F=AD=E4=B8=B4=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E9=97=AD36=2048=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sortFaceForecast/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue index d51f9de1..39990f7f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue @@ -141,14 +141,14 @@ export default { text: "24小时", id: 24, }, - { - text: "36小时", - id: 36, - }, - { - text: "48小时", - id: 48, - }, + // { + // text: "36小时", + // id: 36, + // }, + // { + // text: "48小时", + // id: 48, + // }, ], pointList: [ { From 579c555376a903528ab864cdc30f0c71ed100876 Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Fri, 26 Apr 2024 22:34:13 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/components/AddNEditDialog.vue | 12 +++++------ .../device/strategy/components/TaskItem.vue | 20 ++++++++++--------- .../strategy/components/taskEditDialog.vue | 10 +++++----- .../pages/control/device/strategy/index.vue | 8 ++++---- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue index a66e0c59..165fd214 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue @@ -9,9 +9,9 @@ - +
取消 @@ -173,7 +173,7 @@ export default { this.editData = { id: res.data.id, groupName: res.data.groupName, - status: res.data.status, + // status: res.data.status, remark: res.data.remark, detailedConfiguration: res.data.detailedConfiguration } @@ -206,7 +206,7 @@ export default { this.editData = { id: res.data.id, groupName: res.data.groupName, - status: res.data.status, + // status: res.data.status, remark: res.data.remark, detailedConfiguration: res.data.detailedConfiguration } @@ -256,7 +256,7 @@ export default { this.editData = { id: this.propData.id, groupName : this.propData.groupName, - status: this.propData.status, + // status: this.propData.status, remark: this.propData.remark, detailedConfiguration: this.propData.detailedConfiguration } @@ -264,7 +264,7 @@ export default { this.mode = "add" this.editData = { groupName: "", - status: "1", + // status: "1", remark: "", detailedConfiguration: "" } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue index 6a77bb63..f44e8f07 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue @@ -22,21 +22,21 @@ @@ -55,7 +55,7 @@