diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue index 88695933..5b88a15a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - @@ -50,7 +50,7 @@ export default { data: { deviceName: "LH24", roadName: "G35济泽高速", - stakeMarkId: "k094+079", + stakeMark: "k094+079", direction: "1", organizationName: "山东高速济南发展公司", brand: "XXX厂家", @@ -67,7 +67,7 @@ export default { }, { label: '设备桩号', - key: "stakeMarkId", + key: "stakeMark", }, { label: '所属方向', @@ -103,7 +103,7 @@ export default { this.dialogData.organizationName = data.organizationName; }) - const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId); + const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); console.log("%c [ roadInfo ]-103-「index.vue」", "font-size:15px; background:#36347c; color:#7a78c0;", roadInfo.roadName); if (roadInfo) this.data.roadName = roadInfo.roadName; 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 50b58493..9f98d139 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 @@ -72,7 +72,7 @@ export default { }, { label: '设备桩号', - key: "stakeMarkId", + key: "stakeMark", }, { label: '设备方向', @@ -106,7 +106,7 @@ export default { this.data.organizationName = data.organizationName; }); - const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId); + const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); if (roadInfo) this.data.roadName = roadInfo.roadName; } 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 0048f479..a2898749 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 @@ -1,7 +1,7 @@ - + @@ -59,7 +59,7 @@ export default { }, { label: '设备桩号', - key: "stakeMarkId", + key: "stakeMark", }, { label: '道路名称', @@ -93,7 +93,7 @@ export default { }); - const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMarkId); + const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); console.log("%c [ roadInfo ]-103-「index.vue」", "font-size:15px; background:#36347c; color:#7a78c0;", roadInfo.roadName); if (roadInfo) this.data.roadName = roadInfo.roadName; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue index aaabf6de..4d7b3b19 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue @@ -63,7 +63,7 @@ export default { }, { label: "事件地点:", - key: "stakeMarkId", + key: "stakeMark", type: "text", }, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index a8ab6efa..fd9c83ef 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -68,7 +68,7 @@ export default { // "iotDeviceId": "81221-65535", // "groupId": null, // "productId": 0, - // "stakeMarkId": "k59+289", + // "stakeMark": "k59+289", // "direction": "1", // "deviceName": "大学城入口站前板", // "deviceType": 2, @@ -102,7 +102,7 @@ export default { "remark": null, "params": {}, "id": 11, - "stakeMarkId": "k103+900", + "stakeMark": "k103+900", "direction": "1", "deptId": null, "warningState": 1, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json index 6782a0fa..9ac21202 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/data.json @@ -4,7 +4,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K60+000—K65+000", + "stakeMark": "K60+000—K65+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -25,7 +25,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K75+000—K81+000", + "stakeMark": "K75+000—K81+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -46,7 +46,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K101+000—K104+000", + "stakeMark": "K101+000—K104+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -67,7 +67,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K110+000—K112+000", + "stakeMark": "K110+000—K112+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -88,7 +88,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K147+000—K152+000", + "stakeMark": "K147+000—K152+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -109,7 +109,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K162+000—K166+000", + "stakeMark": "K162+000—K166+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -130,7 +130,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K205+000—K207+000", + "stakeMark": "K205+000—K207+000", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -151,7 +151,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K59+290", + "stakeMark": "K59+290", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -172,7 +172,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K72+844", + "stakeMark": "K72+844", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -193,7 +193,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K83+885", + "stakeMark": "K83+885", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -214,7 +214,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K86+499", + "stakeMark": "K86+499", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -235,7 +235,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K99+750", + "stakeMark": "K99+750", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -256,7 +256,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K105+904", + "stakeMark": "K105+904", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -277,7 +277,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K117+878", + "stakeMark": "K117+878", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -298,7 +298,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K126+224", + "stakeMark": "K126+224", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -319,7 +319,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K145+934", + "stakeMark": "K145+934", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -340,7 +340,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K155+652", + "stakeMark": "K155+652", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -361,7 +361,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K163+250", + "stakeMark": "K163+250", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -382,7 +382,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K173+600", + "stakeMark": "K173+600", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -403,7 +403,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K179+140", + "stakeMark": "K179+140", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -424,7 +424,7 @@ "iotDeviceId": null, "groupId": null, "productId": 285, - "stakeMarkId": "K190+500", + "stakeMark": "K190+500", "direction": null, "deviceName": "智能行车诱导系统", "deviceType": 12, @@ -445,7 +445,7 @@ "iotDeviceId": null, "groupId": null, "productId": 286, - "stakeMarkId": "k59+289", + "stakeMark": "k59+289", "direction": "2", "deviceName": "不知", "deviceType": 12, 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 84345360..bee6ec5c 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 @@ -84,20 +84,20 @@ export function controlCamera(camId, cmdType) { /** * 通过 桩号获取 道路信息 - * @param {*} stakeMarkId 桩号 + * @param {*} stakeMark 桩号 * @returns */ -export function getRoadInfoByStakeMark(stakeMarkId) { +export function getRoadInfoByStakeMark(stakeMark) { return new Promise(async (resolve, reject) => { - if (!stakeMarkId) return reject(); + if (!stakeMark) return reject(); // 获取桩号信息 const stakeMarkInfo = await request({ - // url: `/business/stakeMark/${stakeMarkId}`, + // url: `/business/stakeMark/${stakeMark}`, url: `/business/stakeMark/query`, method: "get", params: { - id: stakeMarkId, + id: stakeMark, direction: 1, }, }) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/testData/device.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/testData/device.js index 0d09610e..d88afa8f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/testData/device.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/testData/device.js @@ -4,7 +4,7 @@ export default [ "iotDeviceId": "8162-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k57+595", + "stakeMark": "k57+595", "direction": "1", "deviceName": "门架式可变信息标志k57+595", "deviceType": 2, @@ -23,7 +23,7 @@ export default [ "iotDeviceId": "8166-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k71+600", + "stakeMark": "k71+600", "direction": "1", "deviceName": "门架式可变信息标志k71+600", "deviceType": 2, @@ -42,7 +42,7 @@ export default [ "iotDeviceId": "2161-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k82+285", + "stakeMark": "k82+285", "direction": "1", "deviceName": "门架式可变信息标志k82+285", "deviceType": 2, @@ -61,7 +61,7 @@ export default [ "iotDeviceId": "31115-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k98+208", + "stakeMark": "k98+208", "direction": "1", "deviceName": "门架式可变信息标志k98+208", "deviceType": 2, @@ -80,7 +80,7 @@ export default [ "iotDeviceId": "31111-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k103+900", + "stakeMark": "k103+900", "direction": "1", "deviceName": "门架式可变信息标志k103+900", "deviceType": 2, @@ -99,7 +99,7 @@ export default [ "iotDeviceId": "81221-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k59+289", + "stakeMark": "k59+289", "direction": "1", "deviceName": "大学城入口站前板", "deviceType": 2, diff --git a/ruoyi-ui/src/views/JiHeExpressway/testData/deviceList.js b/ruoyi-ui/src/views/JiHeExpressway/testData/deviceList.js index bd01a08f..1a1d84e5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/testData/deviceList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/testData/deviceList.js @@ -6,7 +6,7 @@ export default "iotDeviceId": "8162-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k57+595", + "stakeMark": "k57+595", "direction": "1", "deviceName": "门架式可变信息标志k57+595", "deviceType": 2, @@ -25,7 +25,7 @@ export default "iotDeviceId": "8166-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k71+600", + "stakeMark": "k71+600", "direction": "1", "deviceName": "门架式可变信息标志k71+600", "deviceType": 2, @@ -44,7 +44,7 @@ export default "iotDeviceId": "2161-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k82+285", + "stakeMark": "k82+285", "direction": "1", "deviceName": "门架式可变信息标志k82+285", "deviceType": 2, @@ -63,7 +63,7 @@ export default "iotDeviceId": "31115-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k98+208", + "stakeMark": "k98+208", "direction": "1", "deviceName": "门架式可变信息标志k98+208", "deviceType": 2, @@ -82,7 +82,7 @@ export default "iotDeviceId": "31111-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k103+900", + "stakeMark": "k103+900", "direction": "1", "deviceName": "门架式可变信息标志k103+900", "deviceType": 2, @@ -101,7 +101,7 @@ export default "iotDeviceId": "81221-65535", "groupId": null, "productId": 0, - "stakeMarkId": "k59+289", + "stakeMark": "k59+289", "direction": "1", "deviceName": "大学城入口站前板", "deviceType": 2,