From b3015b5553b9c83fe78f6f04a6d1b618ebbcafeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Thu, 18 Jan 2024 10:03:42 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/JiHeExpressway/utils/axios/auth.js | 3 ++-
 ruoyi-ui/vue.config.js                                | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/axios/auth.js b/ruoyi-ui/src/views/JiHeExpressway/utils/axios/auth.js
index 556205fe..214d0baa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/axios/auth.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/axios/auth.js
@@ -4,7 +4,8 @@ import axios from "axios";
 // const RequestURL = `http://10.168.65.211:3000`;
 
 // 后台
-const RequestURL = `http://10.168.77.209:1024/dev-api`;
+// const RequestURL = `http://10.168.77.209:1024/dev-api`;
+const RequestURL = `http://10.166.147.60:9021`
 
 const UN = "jhgskj",
   PD = "jhgskj@2023",
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 5d25731f..fbbd0861 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -42,9 +42,11 @@ module.exports = {
         // target: `http://10.0.81.201:8080`,
         // target: `http://10.168.73.36:8080`, // 周乐
         //target: `http://10.168.77.209:8080`, // 刘朋
-        target:'http://10.168.66.196:8080',
+        // target:'http://10.168.66.196:8080',
         // target: `http://10.168.66.196:8080`, //刘文阁
         // target: `http://10.168.56.206:8087`, //孟
+        // target: `http://10.0.81.209:8087`,
+        target: `http://10.0.81.202:8087`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 20bc05b393672f6b681aeee32dd789b134ca743e Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Thu, 18 Jan 2024 16:31:13 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/MonthlyEquipment/index.js    |  8 ++--
 .../statisticalAnalysis/index.vue             | 41 +++++++++----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
index 1286246f..bb6cc820 100644
--- a/ruoyi-ui/src/api/MonthlyEquipment/index.js
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -43,9 +43,7 @@ export function getSystemStatusList(query) {
     //设备状态列表按类型
    export function getSystemStatusExport(query) {
     //system/status/export
-   return download('/system/status/export',query,"file.xlsx");
-    // return request.post('/system/status/export',{
-    //     ...query
-    //   },{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    //   responseType: 'blob'})
+   //return download('/system/status/export',query,"file.xlsx");
+    return request.post('/system/status/export?startTime='+query.startTime+"&time="+ query.time +"&type="+query.type,{},{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      responseType: 'blob'})
   }
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 9eb67db3..aeae40f4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -455,28 +455,25 @@ import * as echarts from "echarts";
       },
       //导出
       SystemStatusExport(){
-        download(
-        "/fault/list/exportFaultReport",
-        { faultId: row.id },
-        "file.xlsx");
-        // getSystemStatusExport({
-        //   startTime:this.startTime,
-        //   time:this.time,
-        //   type:this.typeQuery,
-        // }).then((res)=>{
-        //   console.log(res);
-        //   const url = window.URL.createObjectURL(new Blob([res]))
-        //   let link = document.createElement('a')
-        //   link.style.display = 'none'
-        //   link.href = url
-        //   link.setAttribute('download', '学生信息列表.xlsx')
-        //   document.body.appendChild(link)
-        //   link.click()
-        //   URL.revokeObjectURL(link.href) // 释放URL 对象
-        //   document.body.removeChild(link)
-        //   link = null
-
-        // })
+   
+        getSystemStatusExport({
+          startTime:this.startTime,
+          time:this.time,
+          type:this.typeQuery,
+        }).then((res)=>{
+          console.log(res);
+          const url = window.URL.createObjectURL(new Blob([res]))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', '设备统计信息.xlsx')
+          document.body.appendChild(link)
+          link.click()
+          URL.revokeObjectURL(link.href) // 释放URL 对象
+          document.body.removeChild(link)
+          link = null
+
+        })
       },
       queryChartList(){
 

From 8a2c69a83ae1c7b7c84a67929636221955d52473 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 16:41:13 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE=E8=B7=9F=20=E5=9C=B0=E5=9B=BE=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoadAndEvents/utils/buttonEvent.js        | 23 +++++++++++++++++++
 .../components/RoadAndEvents/utils/map.js     |  2 +-
 .../pages/Home/components/Thumbnail/index.vue |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index bdc236ca..30bd10fd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -34,6 +34,29 @@ export const eventMap = {
     // };
 
     const data = await getDeviceList(1);
+    // const data = [
+    //   {
+    //     longitude: 116.268564,
+    //     latitude: 35.73115,
+    //   },
+    //   {
+    //     longitude: 116.258178,
+    //     latitude: 35.720996,
+    //   },
+    //   {
+    //     longitude: 116.255542,
+    //     latitude: 35.717335,
+    //   },
+    //   {
+    //     longitude: 116.252883,
+    //     latitude: 35.713114,
+    //   },
+    //   {
+    //     longitude: 116.249416,
+    //     latitude: 35.707627,
+    //     ptzCtrl: 0,
+    //   },
+    // ];
 
     if (!data) return;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 4dab5b53..a9f8ef5f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -97,7 +97,7 @@ export async function setMarkerCluster(map, points, markerFun) {
  * @param {*} _markerClick marker 点击
  * @returns
  */
-export async function setMarkToMap(item, data, _markerClick) {
+export async function setMarkToMap(item, data, _markerClick, content) {
   const { mapIns } = this.getMap();
 
   if (!mapIns) return Message.error("地图加载失败!");
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index 00cc794c..e14b42cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg" id="content" ref="ThumbnailRef"></div>
+  <div class="bg" ref="ThumbnailRef"></div>
 </template>
 
 <script>

From 6684657a09d8af38f0307a4a97c52ab1b022ec3b Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Thu, 18 Jan 2024 16:43:45 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/monthlyEquipment/index.vue                   | 6 ++++++
 .../maintenanceOperations/statisticalAnalysis/index.vue     | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index a790e505..990a5a8d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -141,6 +141,12 @@
                 color:"#FFCE85",
                 top:430,
                 left:620,
+            },{
+                num:60,
+                text:"智能设备箱" ,
+                color:"#FFCE85",
+                top:430,
+                left:920,
             }
         ]
       }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index aeae40f4..a8b7eded 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -173,6 +173,7 @@ import * as echarts from "echarts";
   import Pagination from '@screen/components/Pagination.vue';
   import InputSearch from '@screen/components/InputSearch/index.vue';
   import {  searchFormList } from "./data";
+  import { Loading } from 'element-ui';
 
   export default {
     name: 'publicService',
@@ -455,7 +456,7 @@ import * as echarts from "echarts";
       },
       //导出
       SystemStatusExport(){
-   
+          let loadingInstance = Loading.service({fullscreen:true,background:"#00000052",text:"文件正在下载..."});
         getSystemStatusExport({
           startTime:this.startTime,
           time:this.time,
@@ -472,7 +473,7 @@ import * as echarts from "echarts";
           URL.revokeObjectURL(link.href) // 释放URL 对象
           document.body.removeChild(link)
           link = null
-
+          loadingInstance.close();
         })
       },
       queryChartList(){

From f608a38f1cd73bd4c1237ea52681fe7114f296f2 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 16:48:33 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
index 148fe407..7a615d25 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
+++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
@@ -296,7 +296,6 @@ body {
   div.el-input {
     input.el-input__inner {
       border: 0;
-      height: 100%;
       min-height: fit-content;
       line-height: unset;
       font-size: 12px;

From 5a263daa99d30cc198715c271d100d2a9fdffc63 Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Thu, 18 Jan 2024 17:01:49 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statisticalAnalysis/index.vue             | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index a8b7eded..4f539272 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -6,14 +6,12 @@
               <div class="topTabs" >
                  <div class="item" v-for=" item in equipments" >
                    <div class="title-tool" >
-                     <span class="text" >设备数</span>
-                     <div class="num" >{{ item.num }}</div>
-                     <span class="unit">套</span>
+                     <span class="text" >{{ item.text }}</span>
                    </div>
                    <div class="item-body" >
                       <div class="left-body" >
                         <img src="./assets/shexiangtou.png"  />
-                        <span>{{ item.text }}</span>
+                        <span class="num" >{{ item.num }} <span class="unit">套</span></span>
                       </div>
                       <div class="line" ></div>
                       <div class="right-list" >
@@ -568,6 +566,7 @@ import * as echarts from "echarts";
   
   <style lang='scss' scoped>
 
+
   .bottomTabs {
     position: relative;
     display: inline-flex;
@@ -587,6 +586,8 @@ import * as echarts from "echarts";
     }
   }
 
+
+
   .topTabs {
     display: inline-flex;
     width: 100%;
@@ -633,14 +634,26 @@ import * as echarts from "echarts";
           align-items: center;
           margin:0 10px;
 
-          > span {
-             display: inline-flex;
-             margin-top:10px;
-             font-size: 14px;
-            font-family: PingFang SC, PingFang SC;
-            font-weight: 400;
-            color: #FFFFFFcc;
-          }
+          .num {
+          display: inline-flex;
+          font-size: 19px;
+          font-family: PangMenZhengDao, PangMenZhengDao;
+          font-weight: 400;
+          color: #00D1FF;
+          margin:0 10px;
+          margin-top:20px;
+        }
+
+
+        .unit {
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 500;
+          color: #FFFFFFF0;
+          position: relative;
+          top:5px;
+          left:5px;
+        }  
 
         }
 
@@ -667,7 +680,7 @@ import * as echarts from "echarts";
             position: relative;
             width:100%;
             height:40px;
-            font-size: 14px;
+            font-size: 12px;
             font-family: PingFang SC, PingFang SC;
             font-weight: 400;
             color: #FFFFFF;
@@ -676,21 +689,21 @@ import * as echarts from "echarts";
 
             .show-text1 {
                color:#00EBC1ee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;
             }
 
             .show-text2 {
                color:#FFFFFFee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;               
             }
 
             .show-text3 {
                color:#FFD15Cee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;              
             }
@@ -718,20 +731,9 @@ import * as echarts from "echarts";
           color: #FFFFFF;
         }
 
-        .num {
-          font-size: 19px;
-          font-family: PangMenZhengDao, PangMenZhengDao;
-          font-weight: 400;
-          color: #00D1FF;
-          margin:0 10px;
-        }
 
-        .unit {
-          font-size: 11px;
-          font-family: PingFang SC, PingFang SC;
-          font-weight: 500;
-          color: #FFFFFF50;
-        }
+
+      
 
 
       }

From e0b6a4b5bc6f01fb59e34b89081f796c83496bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Thu, 18 Jan 2024 17:22:22 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/AMapContainer/index.vue          | 7 ++++---
 .../pages/Home/components/RoadAndEvents/utils/map.js       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
index 65ed57fd..0fb1db4d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
@@ -46,8 +46,8 @@ export default {
     this.aMapIns = new this.AMap.Map(this.$refs.mapContainerRef, {
       resizeEnable: true, //是否监控地图容器尺寸变化
       mapStyle: "amap://styles/blue",
-      zoom: 7,
-      center: [116.629514, 35.794168],
+      zoom: 9.5,
+      center: [116.629514, 35.805288],
     });
 
     this.aMapIns.on("complete", () => {
@@ -198,7 +198,8 @@ export default {
       };
     },
   },
-  unmounted() {
+  // unmounted() {
+  destroyed(){
     if (!this.aMapIns) return;
     this.aMapIns.destroyed();
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index a9f8ef5f..92e0704f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -153,7 +153,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
     markerClick
   );
 
-  mapIns.setFitView([...markerCluster.U], false, [0, 0, 0, 0], 7);
+  mapIns.setFitView([...markerCluster.U], false, [0, 0, 0, 0], 10);
 
   return () => markerCluster.setMap(null);
 }

From 11e06b910265c8b1a499dfb81f215c689a5f54c9 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 17:33:11 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/buttonEvent.js    | 2 +-
 .../pages/Home/components/RoadAndEvents/utils/map.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index 30bd10fd..9a131d53 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -69,7 +69,7 @@ export const eventMap = {
       (extData) => {
         this.dialogConfig = {
           // 0 有（球机） 1 ⽆（枪机）
-          component: cameraCtrlMap[extData.ptzCtrl],
+          component: cameraCtrlMap[extData.other_config?.ptzCtrl],
           data: extData,
         };
       }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 92e0704f..d5e8c0b7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -146,7 +146,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
           height: 18px;
           margin-left: 3px;
           margin-bottom: 6px;
-        " src='${item.status !== "0" ? fault : normal}'>
+          " src='${item.device_state !== "0" ? fault : normal}'>
         </div>`,
       };
     }),

From a76e53a4c2f06d906c654b4004ba8669e590fc99 Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Thu, 18 Jan 2024 17:40:10 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8E=E9=83=A8=E5=B1=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/deviceUptime/assets/charts.js     |  6 +++---
 .../components/deviceUptime/index.vue            |  2 +-
 .../components/monthlyEquipment/assets/charts.js |  2 +-
 .../components/monthlyEquipment/index.vue        |  6 +++---
 .../statisticalAnalysis/index.vue                | 16 +++++++++++++---
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
index 7ef5a96f..4b35b669 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
@@ -1,5 +1,5 @@
 
-let data = [100, 0, 0, 0, 40, 40,40, 64,40, 64,40, 64]
+let data = [0, 0, 0, 0, 0, 0,0, 0,0, 0,0, 0]
 let indicator = [
 
     { name: '智能设备箱', max: 100 },
@@ -25,7 +25,7 @@ let options = {
     tooltip: {},
     radar: {
         center: ['50%', '50%'],
-        radius: '75%',
+        radius: '72%',
         nameGap: 0,
         indicator: indicator,
         splitLine: {
@@ -41,7 +41,7 @@ let options = {
         name: {
             textStyle: {
                 color: '#F2F3F5',
-                fontSize: '20',
+                fontSize: '14',
                 borderRadius: 3,
                 padding: [3, 5]
             }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
index f9a96f92..9e1e1eb9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
@@ -74,7 +74,7 @@
       padding: 0px 20px;
       background: linear-gradient(180deg, rgba(6,66,88,0.2) 0%, #064258 100%);
       border-radius: 5px 5px 5px 5px;
-        opacity: 0.8;
+        opacity:1;
         border: 1px solid;
         border-image: linear-gradient(360deg, rgba(55, 231, 255,0.3), rgba(55, 231, 255, 0)) 1 1;
       display: flex;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
index c10c506b..dfd3d256 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
@@ -41,7 +41,7 @@ let options = {
         name: {
             textStyle: {
                 color: '#F2F3F5',
-                fontSize: '20',
+                fontSize: '12',
                 borderRadius: 3,
                 padding: [3, 5]
             }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index 990a5a8d..a55e0448 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -146,7 +146,7 @@
                 text:"智能设备箱" ,
                 color:"#FFCE85",
                 top:430,
-                left:920,
+                left:920,  
             }
         ]
       }
@@ -203,7 +203,7 @@
       padding: 0px 20px;
       background: linear-gradient(180deg, rgba(6,66,88,0.2) 0%, #064258 100%);
       border-radius: 5px 5px 5px 5px;
-        opacity: 0.8;
+        opacity: 1;
         border: 1px solid;
         border-image: linear-gradient(360deg, rgba(55, 231, 255,0.3), rgba(55, 231, 255, 0)) 1 1;
       display: flex;
@@ -268,7 +268,7 @@
             align-items: center;    
             width: 100%;
             height: 21px;
-            font-size: 12px;
+            font-size: 14px;
             font-family: Hiragino Sans GB, Hiragino Sans GB;
             font-weight: normal;
             color: #FFFFFF;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 4f539272..66bac610 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -16,13 +16,12 @@
                       <div class="line" ></div>
                       <div class="right-list" >
                          <div class="list-text" >
-                            <span>在线：</span>
+                          <span>在线：</span>
                             <div class="show-text1" >
                               {{ item.sucessRate }}
                             </div>
                          </div>
-                         <div class="list-text" >
-                            <span>离线：</span>
+                         <div class="list-text" ><span>离线：</span>
                               <div class="show-text2" >
                                 {{ item.failRate }}
                               </div>
@@ -521,6 +520,9 @@ import * as echarts from "echarts";
                 }
                 console.log(it,i);
                 i+= 1;
+                if ( it == "全部设备" ) {
+                  allList.splice(0,0,item);
+                } else 
                 allList.push(item);
              }
              console.log(allList);
@@ -687,7 +689,13 @@ import * as echarts from "echarts";
             justify-content: center;
             align-items: center;
 
+            > span:first-child {
+               display: inline-flex;
+               width:40px;
+            }
+
             .show-text1 {
+              width:100px;
                color:#00EBC1ee;
                font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
@@ -695,6 +703,7 @@ import * as echarts from "echarts";
             }
 
             .show-text2 {
+              width:100px;
                color:#FFFFFFee;
                font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
@@ -702,6 +711,7 @@ import * as echarts from "echarts";
             }
 
             .show-text3 {
+              width:100px;
                color:#FFD15Cee;
                font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;

From ef4fae75db886869899828c27b046e5c71c6400c Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 17:41:22 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RoadAndEvents/utils/buttonEvent.js    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index 9a131d53..c802e889 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -67,11 +67,13 @@ export const eventMap = {
       item,
       data,
       (extData) => {
-        this.dialogConfig = {
-          // 0 有（球机） 1 ⽆（枪机）
-          component: cameraCtrlMap[extData.other_config?.ptzCtrl],
-          data: extData,
-        };
+        try {
+          this.dialogConfig = {
+            // 0 有（球机） 1 ⽆（枪机）
+            component: cameraCtrlMap[JSON.parse(extData.other_config)?.ptzCtrl],
+            data: extData,
+          };
+        } catch (error) {}
       }
     );
   },

From b4042fb7b1a25dad1bdb6e052229bcf002d8ea53 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 18:15:41 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/README.md                                    |  6 +++++-
 ruoyi-ui/package.json                                 |  5 +++--
 ruoyi-ui/public/index.html                            |  1 +
 .../components/RoadAndEvents/utils/buttonEvent.js     |  2 +-
 ruoyi-ui/vue.config.js                                | 11 +++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md
index 0ff43ea1..559cb4f1 100644
--- a/ruoyi-ui/README.md
+++ b/ruoyi-ui/README.md
@@ -16,6 +16,10 @@
 -->
 ## 开发
 
+```
+  ruoyi版本号 3.7.0
+```
+
 ```bash
 # 克隆项目
 git clone https://gitee.com/y_project/RuoYi-Vue
@@ -45,7 +49,7 @@ npm install --save el-tree-transfer
 npm run dev
 ```
 
-浏览器访问 http://localhost:80
+浏览器访问 <http://localhost:80>
 
 ## 发布
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 3a0fd127..3f9bfe8e 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,12 +1,13 @@
 {
   "name": "ruoyi",
-  "version": "3.7.0",
+  "version": "0.0.1",
   "description": "雅典娜",
   "author": "若依",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
+    "build:version": "./build/build.sh",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
@@ -151,4 +152,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}
\ No newline at end of file
diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html
index 36417423..032fe88f 100644
--- a/ruoyi-ui/public/index.html
+++ b/ruoyi-ui/public/index.html
@@ -5,6 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
+  <meta name="build" content="<%= process.env.Version %>">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index c802e889..0a575aef 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -70,7 +70,7 @@ export const eventMap = {
         try {
           this.dialogConfig = {
             // 0 有（球机） 1 ⽆（枪机）
-            component: cameraCtrlMap[JSON.parse(extData.other_config)?.ptzCtrl],
+            component: cameraCtrlMap[JSON.parse(extData.otherConfig)?.ptzCtrl],
             data: extData,
           };
         } catch (error) {}
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 8d54558f..431fc799 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -1,5 +1,8 @@
 "use strict";
 const path = require("path");
+const webpack = require("webpack");
+
+const packageJSON = require("./package.json");
 
 function resolve(dir) {
   return path.join(__dirname, dir);
@@ -79,6 +82,14 @@ module.exports = {
   chainWebpack(config) {
     config.plugins.delete("preload"); // TODO: need test
     config.plugins.delete("prefetch"); // TODO: need test
+    config.plugin("DefinePlugin").use(webpack.DefinePlugin, [
+      {
+        "process.env.Version": (() =>
+          JSON.stringify(
+            `${new Date().toLocaleString()}-V${packageJSON.version}`
+          ))(),
+      },
+    ]);
 
     const rootModulesPath = path.resolve("node_modules");
     if (config.resolve.modules.store.has(rootModulesPath)) {

From 37ec631881c51660b0f669add2563905b7d5b55a Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 18:23:09 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/JiHeExpressway/components/Video/videoStream.js    | 2 +-
 .../pages/Home/components/Dialogs/Camera/Descriptions.vue       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index 6c1b7e72..34860792 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -130,7 +130,7 @@ export class HttpLivePlayer {
     });
 
     // 视频断流
-    this.player.on(flvJs.Events.STATISTICS_INFO, function (res) {
+    this.player.on(flvJs.Events.STATISTICS_INFO, (res) => {
       if (this.lastDecodedFrames != res.decodedFrames) {
         this.lastDecodedFrames = res.decodedFrames;
       } else {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
index a9445cae..df572c87 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
@@ -47,6 +47,7 @@
 <script>
 import { CameraStatusEnum, CameraControlTypeEnum } from "@screen/utils/enum.js"
 import { getRoadInfoByStakeMark } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import request from "@/utils/request";
 
 export default {
   name: 'Descriptions',

From 6f5f3dfabf142b35517279d245fc55e09fe6fb4f Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 18:30:51 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Camera/index.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index bd98a292..a05e58e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -6,7 +6,7 @@
         <img src="@screen/images/dialog/icon-video.png" />
       </div>
 
-      <Video class="video-stream" :camId="dialogData.camId" />
+      <Video class="video-stream" :camId="dialogData.iotDeviceId" />
 
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="详细设计" name="first">

From b673759aff7d68c8c573409a7c620744f1a03ab5 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 18:39:17 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/map.js          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index d5e8c0b7..59b7a53a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -132,7 +132,9 @@ export async function setMarkToMap(item, data, _markerClick, content) {
         content:
           content ||
           `<div style="
-          background-image: url(${item.status !== "0" ? faultBg : normalBg});
+          background-image: url(${
+            item.device_state !== "0" ? faultBg : normalBg
+          });
           background-size: 100% 100%;
           background-repeat: no-repeat;
           width: 42px;

From 16a2b64f101447de402a6e5d6e07d9b911e8ea0a Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 18:50:58 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        | 16 ++++++++++----
 .../RoadAndEvents/utils/httpList.js           | 22 +++++++++++++------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 446f90bd..04a56389 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -22,9 +22,10 @@ import Form from '@screen/components/FormConfig';
 
 import { cloneDeep } from "lodash"
 import { delay } from "@screen/utils/common.js"
+import request from "@/utils/request";
 
 import { Message } from "element-ui";
-import { axiosIns } from "@screen/utils/axios/auth.js";
+// import { axiosIns } from "@screen/utils/axios/auth.js";
 
 const workStatus = [
   {
@@ -142,7 +143,10 @@ export default {
       handler(bool) {
         if (!bool) return;
 
-        axiosIns.post(`business/device/functions/${this.deviceId}/${51}`)
+        request({
+          url: `business/device/functions/${this.deviceId}/${51}`,
+          method: "post",
+        })
           .then(async (result) => {
             if (result.code != 200) return;
 
@@ -197,10 +201,14 @@ export default {
 
       /**
        * 接口 地址
+       *
        * https://www.showdoc.com.cn/2450725213006196/10877717880262686
        */
-
-      axiosIns.post(`business/device/functions/${this.deviceId}/${functionId}`, result)
+      request({
+        url: `business/device/functions/${this.deviceId}/${functionId}`,
+        method: "post",
+        params: result,
+      })
         .then((result) => {
           if (result.code != 200) return Message.error(`设备操作失败!`);
 
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 e606a0f2..f12b7095 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
@@ -71,20 +71,28 @@ export function controlCamera(camId, cmdType) {
  * @returns
  */
 export async function getRoadInfoByStakeMark(stakeMarkId) {
-  const stakeMarkInfo = await axiosIns.get(
-    `/business/stakeMark/${stakeMarkId}`
-  );
+  const stakeMarkInfo = await request({
+    url: `/business/stakeMark/${stakeMarkId}`,
+    method: "get",
+    // params
+  });
 
   if (!stakeMarkInfo.data?.section_id) return {};
 
-  const roadSectionInfo = await axiosIns.get(
-    `/business/roadSection/${stakeMarkInfo.data.section_id}`
-  );
+  const roadSectionInfo = await request({
+    url: `/business/roadSection/${stakeMarkInfo.data.section_id}`,
+    method: "get",
+  });
 
   if (!roadSectionInfo.data?.road_id) return {};
 
   return (
-    (await axiosIns.get(`/business/road/${roadSectionInfo.road_id}`)).data || {}
+    (
+      await request({
+        url: `/business/road/${roadSectionInfo.road_id}`,
+        method: "get",
+      })
+    ).data || {}
   );
 }
 

From f23b3de8744d37e5c26728b43fb66f1a2d1ed926 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 19:17:41 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/build/build.sh                             | 13 +++++++++++++
 .../Home/components/Dialogs/Camera/Descriptions.vue |  2 +-
 .../Home/components/Dialogs/ControlCamera/index.vue |  6 +++---
 .../components/Dialogs/DrivingGuidance/index.vue    |  8 ++++----
 .../Home/components/RoadAndEvents/utils/httpList.js | 10 +++++-----
 .../Home/components/RoadAndEvents/utils/map.js      |  4 ++--
 .../Cards/AuditLists/index.vue                      |  1 -
 7 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100755 ruoyi-ui/build/build.sh

diff --git a/ruoyi-ui/build/build.sh b/ruoyi-ui/build/build.sh
new file mode 100755
index 00000000..02d70467
--- /dev/null
+++ b/ruoyi-ui/build/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+branchVersion=`cat package.json | sed 's/,/\n/g' | grep \"version\" | sed 's/:/\n/g' | sed '1d' | sed 's/}//g' | grep -Eo '[0-9]*'`;
+
+git checkout -b v$branchVersion &&
+
+npm run build &&
+
+git push -u origin $branchVersion &&
+
+git checkout develop &&
+
+npm version patch
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
index df572c87..50f7b74d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/Descriptions.vue
@@ -81,7 +81,7 @@ export default {
 
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId);
 
-    if (roadInfo) this.data.roadName = roadInfo.dc_road;
+    if (roadInfo) this.data.roadName = roadInfo.dcRoad;
   },
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ControlCamera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ControlCamera/index.vue
index 81f765c2..28739d2c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ControlCamera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ControlCamera/index.vue
@@ -104,7 +104,7 @@ export default {
         },
         {
           label: '设备状态',
-          key: "device_state",
+          key: "deviceState",
           enum: "DeviceTypeEnum"
         },
       ],
@@ -133,11 +133,11 @@ export default {
   async created() {
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId);
 
-    if (roadInfo) this.dialogData.roadName = roadInfo.dc_road;
+    if (roadInfo) this.dialogData.roadName = roadInfo.dcRoad;
   },
   methods: {
     controlClick: throttle(function (type) {
-      controlCamera(this.dialogData.camId, type)
+      controlCamera(this.dialogData.iotDeviceId, type)
     }, 360)
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 77da3e59..86c12236 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -50,7 +50,7 @@ export default {
         deviceStation: "k094+079",
         roadName: "G35济泽高速",
         direction: "1",
-        device_state: "0",
+        deviceState: "0",
         deviceVendors: "XXX厂家",
       },
       list: [
@@ -73,7 +73,7 @@ export default {
         },
         {
           label: '设备状态',
-          key: "device_state",
+          key: "deviceState",
           enum: "DeviceTypeEnum"
         },
         {
@@ -87,7 +87,7 @@ export default {
     this.dialogData.roadName = "G35济泽高速";
 
     request({
-      url: `/business/product/${this.dialogData.product_id}`,
+      url: `/business/product/${this.dialogData.productId}`,
       method: "get",
     })
       .then(({ code, data }) => {
@@ -101,7 +101,7 @@ export default {
 
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId);
 
-    if (roadInfo) this.dialogData.roadName = roadInfo.dc_road;
+    if (roadInfo) this.dialogData.roadName = roadInfo.dcRoad;
   },
   methods: {
     handleClickTabs() { }
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 f12b7095..add69164 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
@@ -1,5 +1,5 @@
 import { Message } from "element-ui";
-import { axiosIns } from "@screen/utils/axios/auth.js";
+// import { axiosIns } from "@screen/utils/axios/auth.js";
 
 import request from "@/utils/request";
 
@@ -77,19 +77,19 @@ export async function getRoadInfoByStakeMark(stakeMarkId) {
     // params
   });
 
-  if (!stakeMarkInfo.data?.section_id) return {};
+  if (!stakeMarkInfo.data?.sectionId) return {};
 
   const roadSectionInfo = await request({
-    url: `/business/roadSection/${stakeMarkInfo.data.section_id}`,
+    url: `/business/roadSection/${stakeMarkInfo.data.sectionId}`,
     method: "get",
   });
 
-  if (!roadSectionInfo.data?.road_id) return {};
+  if (!roadSectionInfo.data?.roadId) return {};
 
   return (
     (
       await request({
-        url: `/business/road/${roadSectionInfo.road_id}`,
+        url: `/business/road/${roadSectionInfo.roadId}`,
         method: "get",
       })
     ).data || {}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 59b7a53a..c0bb0a45 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -133,7 +133,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
           content ||
           `<div style="
           background-image: url(${
-            item.device_state !== "0" ? faultBg : normalBg
+            item.deviceState !== "0" ? faultBg : normalBg
           });
           background-size: 100% 100%;
           background-repeat: no-repeat;
@@ -148,7 +148,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
           height: 18px;
           margin-left: 3px;
           margin-bottom: 6px;
-          " src='${item.device_state !== "0" ? fault : normal}'>
+          " src='${item.deviceState !== "0" ? fault : normal}'>
         </div>`,
       };
     }),
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
index d1c2bb9f..ccf1ba2b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
@@ -15,7 +15,6 @@ import Card2 from "@screen/components/Card2/Card.vue";
 import Pagination from '@screen/components/Pagination.vue';
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import ListItem from "./ListItem.vue";
-import { axiosIns } from "@screen/utils/axios/auth.js";
 
 export default {
   name: 'Auditlists',

From 4868c9b61d6556a3235f72f628fff1ce4043c4de Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 19:29:21 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=81=93=E8=B7=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/httpList.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 add69164..60c6ea9c 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
@@ -72,9 +72,13 @@ export function controlCamera(camId, cmdType) {
  */
 export async function getRoadInfoByStakeMark(stakeMarkId) {
   const stakeMarkInfo = await request({
-    url: `/business/stakeMark/${stakeMarkId}`,
+    // url: `/business/stakeMark/${stakeMarkId}`,
+    url: `/business/stakeMark`,
     method: "get",
-    // params
+    params: {
+      id: stakeMarkId,
+      direction: 1,
+    },
   });
 
   if (!stakeMarkInfo.data?.sectionId) return {};

From 43ffca7b7e83b393a329b4e118cbbe7c080a9a48 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 19:42:06 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E5=8F=82=E6=95=B0=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/httpList.js        | 1 +
 1 file changed, 1 insertion(+)

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 60c6ea9c..47cb9d6a 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
@@ -56,6 +56,7 @@ export function controlCamera(camId, cmdType) {
       msgType: 3,
       camId,
       cmdType,
+      speed: 1,
     },
   })
     .then((result) => {