diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/data.js index 9057ab3e..9b844eb1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/data.js @@ -1,4 +1,32 @@ -import moment from "moment/moment"; +// 门架选项数据 +const intervalOptions = [ + "嘉祥西虚-王官屯枢纽", + "东平虚-东济济广枢纽", + "平阴南虚-魏雪枢纽", + "孔村枢纽-平阴南虚", + "平阴虚-孔村枢纽", + "长清虚-松竹枢纽", + "殷家村枢纽-长清大学城虚", + "长清大学城虚-长清虚", + "孝里虚-平阴北虚", + "平阴北虚-平阴虚", + "东济济广枢纽-梁山东虚", + "梁山东虚-梁山虚", + "梁山虚-信楼枢纽", + "松竹枢纽-长清虚", + "孔村枢纽-平阴虚", + "平阴南虚-孔村枢纽", + "魏雪枢纽-平阴南虚", + "东济济广枢纽-东平虚", + "王官屯枢纽-嘉祥西虚", + "长清大学城虚-殷家村枢纽", + "长清虚-长清大学城虚", + "平阴北虚-孝里虚", + "平阴虚-平阴北虚", + "梁山东虚-东济济广枢纽", + "梁山虚-梁山东虚", + "信楼枢纽-梁山虚" +].map(label => ({ value: label, label })); export const searchFormList = [ { @@ -7,28 +35,28 @@ export const searchFormList = [ type: "select", options: { options: [ - { - value: 1, - label: "菏泽方向", - }, - { - value: 3, - label: "济南方向", - },{ - value: '', - label: "双向", - } - ], - }, + { value: 1, label: "菏泽方向" }, + { value: 3, label: "济南方向" }, + { value: "", label: "双向" } + ] + } + }, + { + label: "门架:", + key: "facilityName", + type: "select", + options: { + options: intervalOptions + } }, { label: "时间范围:", key: "time", type: "datePicker", - default:[moment().format('YYYY-MM-DD'),moment().format('YYYY-MM-DD')], + default: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], options: { format: "yyyy-MM-dd", - type: "daterange", - }, - }, + type: "daterange" + } + } ]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue index 41de34ef..5006c024 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue @@ -16,7 +16,7 @@ 刷新 - + @@ -30,6 +30,7 @@ + @@ -42,7 +43,7 @@ - + @@ -116,6 +117,11 @@ export default { } else { _search['direction'] = null } + if(data.facilityName){ + _search['facilityName'] = data.facilityName; + } else { + _search['facilityName'] = null + } this.searchData = { ...this.searchData, ..._search @@ -137,6 +143,7 @@ export default { getSearchData() { let params = { direction: this.searchData?.direction, + facilityName: this.facilityName?.facilityName, pageSize: this.pageSize, pageNum: this.currentPage, @@ -146,10 +153,10 @@ export default { initData() { if(!this.searchData.startDate){ this.searchData.startDate = moment().format('YYYY-MM-DD') - } + } if(!this.searchData.endDate){ this.searchData.endDate = moment().format('YYYY-MM-DD') - } + } this.searchData.periodType = 4 request({ url: `/business/traffic-statistics/history/trafficFlowStatistics`, @@ -225,11 +232,11 @@ export default { height: 120px; margin-left: 55%; bottom: 210px; - z-index: 9999; + z-index: 9999; } ::v-deep .el-upload-dragger{ background-color: #104c66 !important; border: 1px solid #359cbc !important; - + }