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 209fa293..de2673c8 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 @@ -211,17 +211,29 @@ export function getDeviceList(deviceType, options) { return reject(); } - const data = { - deviceType, - ...options, - }; - + // const data = { + // deviceType, + // ...options, + // }; + let newEndStakeMark = []; + let newStartStakeMark = []; + + options.endStakeMark.forEach((item) => { + newEndStakeMark.push(String(item)); + }); + options.startStakeMark.forEach((item) => { + newStartStakeMark.push(String(item)); + }); request( Object.keys(options || {}).length ? { url: "/business/device/pileNumberQuery", method: "POST", - data, + data: { + deviceType, + endStakeMark: newEndStakeMark, + startStakeMark: newStartStakeMark, + }, } : { url: "/business/device/query", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js index aa240068..0b5defea 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js @@ -79,6 +79,7 @@ let options = { color: "#1C82C5", }, }, + // minInterval: 1, splitLine: { show: true, lineStyle: { @@ -109,6 +110,7 @@ let options = { // color: "#1C82C5", // }, }, + // minInterval: 1, splitLine: { show: false, lineStyle: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js index 3619aed6..28256fe2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js @@ -73,6 +73,7 @@ let options = { fontSize: 10, }, }, + // minInterval: 1, axisLine: { show: false, }, @@ -101,6 +102,7 @@ let options = { // formatter: "{value} °C", }, }, + // minInterval: 1, axisLine: { show: false, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js index fa80a0e0..e3817321 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js @@ -101,6 +101,7 @@ var options = { // + minNumber; }, }, + // minInterval: 1, }, { type: "value", @@ -115,6 +116,7 @@ var options = { type: "dotted", }, }, + // minInterval: 1, axisTick: { show: false, }, 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: [ { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue index 407a1058..45ec4c02 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue @@ -10,7 +10,7 @@ style="width: 100%" > - +
{{ 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`, //王兴琳