diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js
index 15fc2e5a..4a298420 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js
@@ -66,6 +66,10 @@ export const searchFormList = [
key: "3",
label: "年",
},
+ {
+ key: "5",
+ label: "周",
+ },
{
key: "4",
label: "日期范围",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue
index a1a03b88..f2a39180 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue
@@ -55,6 +55,10 @@
+
+
+
+
@@ -124,6 +131,9 @@
+
+
+
@@ -147,6 +157,9 @@
+
+
+
@@ -415,7 +428,12 @@
if (this.queryForm.dataType == '1'){
tableChartsOptions.yAxis[0].name = '流量'
dataList = this.tableData.slice(0,this.tableData.length - 4);
- tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
+ if (this.queryForm.type == '5'){
+ tableChartsOptions.xAxis.data = dataList.map(item => item.time)
+ } else {
+ tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
+ }
+
if (this.queryForm.direction == '1'){
tableChartsOptions.series = [
{
@@ -462,8 +480,11 @@
} else {
tableChartsOptions.yAxis[0].name = '车速'
dataList = this.tableData.slice(0,this.tableData.length - 1);
- tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
-
+ if (this.queryForm.type == '5'){
+ tableChartsOptions.xAxis.data = dataList.map(item => item.time)
+ } else {
+ tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
+ }
if (this.queryForm.direction == '1'){
tableChartsOptions.series = [
{
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 298b5dce..b55c79aa 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
@@ -21,6 +21,10 @@ export const searchFormList = [
key: "year",
label: "年",
},
+ {
+ key: "week",
+ label: "周",
+ },
{
key: "range",
label: "日期范围",
@@ -102,7 +106,7 @@ export const searchFormList = [
},
default: moment().format("YYYY-MM-DD"),
visible: (data) => {
- if (data.type == "year") {
+ if (data.type == "year" || data.type == "week") {
return true;
}
},
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 06b9e36f..d56a6f09 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
@@ -36,6 +36,8 @@
+
+