From 586d134ddbb9f06b3646dd6d204311fde458bc40 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Mon, 24 Feb 2025 15:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=B1=BB=E4=BA=A4=E8=B0=83=E7=AB=99?=
 =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../perception/trafficSurvey/survey/data.js   | 27 ++++++++++++++++++-
 .../perception/trafficSurvey/survey/index.vue | 20 ++++++++------
 2 files changed, 38 insertions(+), 9 deletions(-)

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 @@
             <span>一类交调站{{scope.row.stakeMark}}</span>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="方向" prop="direction"  align="center" header-align="center" width="120">
-          <template slot-scope="scope">
-            <span v-if="scope.row.direction == '1'">菏泽</span>
-            <span v-if="scope.row.direction == '3'">济南</span>
-            <span v-if="scope.row.direction == '2'">合计</span>
-          </template>
-        </ElTableColumn>
+        <ElTableColumn label="方向" prop="direction"  align="center" header-align="center" width="120" />
         <ElTableColumn v-for="item in columnList" :label="item.label" :prop="item.key" min-width="80" align="center" header-align="center" />
         <ElTableColumn label="合计" prop="total" width="150" align="center" header-align="center" />
       </Table>
@@ -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) {