diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js
index 0dc29366..298b5dce 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js
@@ -106,5 +106,30 @@ export const searchFormList = [
return true;
}
},
- }
+ },
+ {
+ label: "类型:",
+ key: "rowType",
+ type: "RadioGroup",
+ isAlone: true,
+ required: true,
+ default:'1',
+ options: {
+ activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+ options: [
+ {
+ key: "1",
+ label: "全部",
+ },
+ {
+ key: "2",
+ label: "按方向",
+ },
+ {
+ key: "3",
+ label: "按车型",
+ },
+ ],
+ },
+ },
];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue
index ba3c33b8..06b9e36f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue
@@ -33,13 +33,7 @@
一类交调站{{scope.row.stakeMark}}
-
-
- 菏泽
- 济南
- 合计
-
-
+
@@ -141,6 +135,7 @@ export default {
this.searchData.timestamp = data.timestamp
this.searchData.startTime = data.startTime
this.searchData.endTime = data.endTime
+ this.searchData.rowType = data.rowType
this.initData();
},
indexMethod(index) {
@@ -163,14 +158,23 @@ export default {
if(!this.searchData.type){
this.searchData.type = 'day'
}
+ if(!this.searchData.rowType){
+ this.searchData.rowType = '1'
+ }
request({
url: `/trafficSurveyData/dcTrafficSurveyData/list`,
method: "get",
params: this.searchData,
+ }).then((result) => {
+ this.loadCharts(result.data)
+ });
+ request({
+ url: `/trafficSurveyData/dcTrafficSurveyData/listNew`,
+ method: "get",
+ params: this.searchData,
}).then((result) => {
this.columnList = result.data.columnList
this.tableData = result.data.rowList
- this.loadCharts(result.data)
});
},
onSizeChange(pageSize) {