From 365e14238e11f8463a1df650a9f6873a0e40fb1d Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Fri, 26 Apr 2024 22:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoadAndEvents/utils/httpList.js           | 23 +++++++++++++++----
 .../postTrendsMonth/assets/charts.js          |  2 ++
 .../postTrendsMonth/assets/charts2.js         |  2 ++
 .../postTrendsMonth/assets/charts3.js         |  2 ++
 ruoyi-ui/vue.config.js                        |  4 ++--
 5 files changed, 26 insertions(+), 7 deletions(-)

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..d533ffde 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
@@ -205,23 +205,36 @@ const DeviceTypeMap = {
   14: "光线在线监测",
  */
 export function getDeviceList(deviceType, options) {
+  console.log("++++++++++++", options);
   return new Promise((resolve, reject) => {
     if (!deviceType) {
       Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
       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/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`, //王兴琳