字段修改提交

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

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>

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)
   }
 }

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() { }

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 || {}

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>`,
       };
     }),

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',