From fc170894cc6148e7b865d315c9369b5baa2c804a Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:16:22 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B7=AF=E5=BE=84?= =?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/httpList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 47cb9d6a..d065e351 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 @@ -74,7 +74,7 @@ export function controlCamera(camId, cmdType) { export async function getRoadInfoByStakeMark(stakeMarkId) { const stakeMarkInfo = await request({ // url: `/business/stakeMark/${stakeMarkId}`, - url: `/business/stakeMark`, + url: `/business/stakeMark/query`, method: "get", params: { id: stakeMarkId, From e00be809c1d1d92f17c05a9534c82309c552bf47 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:22:30 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/RoadAndEvents/utils/httpList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d065e351..21753b05 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 @@ -82,7 +82,7 @@ export async function getRoadInfoByStakeMark(stakeMarkId) { }, }); - if (!stakeMarkInfo.data?.sectionId) return {}; + if (!stakeMarkInfo.data[0]?.sectionId) return {}; const roadSectionInfo = await request({ url: `/business/roadSection/${stakeMarkInfo.data.sectionId}`, From e93529f35bd191c1769d0785566ef88c66564a47 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:27:08 +0800 Subject: [PATCH 03/14] =?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 --- .../Dialogs/DrivingGuidance/components/DeviceControlDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 04a56389..01aaf19e 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 @@ -144,7 +144,7 @@ export default { if (!bool) return; request({ - url: `business/device/functions/${this.deviceId}/${51}`, + url: `business/device/functions/${this.deviceId}/${52}`, method: "post", }) .then(async (result) => { From 03418df5fa018b57f96948742f0f571f519ecc3e Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:37:44 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=AD=BB=E6=95=B0=E6=8D=AE=20=20?= =?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 --- .../pages/Home/components/Dialogs/DrivingGuidance/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 86c12236..f6499850 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 @@ -15,7 +15,7 @@ - + From e5de48e72e817fd87da0c1a6cf6277e1d6687bb7 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:47:04 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/DrivingGuidance/components/DeviceControlDialog.vue | 1 + 1 file changed, 1 insertion(+) 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 01aaf19e..73acab39 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 @@ -146,6 +146,7 @@ export default { request({ url: `business/device/functions/${this.deviceId}/${52}`, method: "post", + params: {} }) .then(async (result) => { if (result.code != 200) return; From 754f8c4a39063fcaf6ed895541c8e56a9ae3a585 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:53:39 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrivingGuidance/components/DeviceControlDialog.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 73acab39..80a8ba5b 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 @@ -146,7 +146,9 @@ export default { request({ url: `business/device/functions/${this.deviceId}/${52}`, method: "post", - params: {} + params: { + _a: '-' + } }) .then(async (result) => { if (result.code != 200) return; From 31801621b513c3bd8965df7d7d4ece1806353f5e Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 20:56:08 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrivingGuidance/components/DeviceControlDialog.vue | 8 +------- 1 file changed, 1 insertion(+), 7 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 80a8ba5b..1dfa798f 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 @@ -143,13 +143,7 @@ export default { handler(bool) { if (!bool) return; - request({ - url: `business/device/functions/${this.deviceId}/${52}`, - method: "post", - params: { - _a: '-' - } - }) + request.post(`business/device/functions/${this.deviceId}/${52}`, {}) .then(async (result) => { if (result.code != 200) return; From 4123aeba47154af71bde0eb5f0dfe812a2ff5fe7 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 21:00:43 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/DrivingGuidance/components/DeviceControlDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1dfa798f..3ca49c4d 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 @@ -151,7 +151,7 @@ export default { const formData = this.$refs.FormConfigRef?.formData; - const data = result.data; + const data = result.data[0]; switch (data.mode) { case "00": From 71b151fa50cb5223bde7d700e9bc3895a16308c2 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 21:02:27 +0800 Subject: [PATCH 09/14] =?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 --- .../DrivingGuidance/components/DeviceControlDialog.vue | 6 +----- 1 file changed, 1 insertion(+), 5 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 3ca49c4d..8aa32fd7 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 @@ -201,11 +201,7 @@ export default { * * https://www.showdoc.com.cn/2450725213006196/10877717880262686 */ - request({ - url: `business/device/functions/${this.deviceId}/${functionId}`, - method: "post", - params: result, - }) + request.post(`business/device/functions/${this.deviceId}/${functionId}`, result) .then((result) => { if (result.code != 200) return Message.error(`设备操作失败!`); From 5fc52c2ee765d66b375325361bb6c8968932a611 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Thu, 18 Jan 2024 21:10:22 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/components/RoadAndEvents/index.vue | 7 +- .../RoadAndEvents/utils/buttonEvent.js | 110 ++++++++++++++---- .../views/JiHeExpressway/pages/Home/index.vue | 56 ++++----- 3 files changed, 123 insertions(+), 50 deletions(-) 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 0ae0c253..a663cbed 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 @@ -28,7 +28,8 @@ - + @@ -41,6 +42,7 @@ import Bg1 from "@screen/components/Decorations/bg-1.vue" import ControlCamera from "./../Dialogs/ControlCamera/index.vue" import DrivingGuidance from "./../Dialogs/DrivingGuidance/index.vue" import Camera from "./../Dialogs/Camera/index.vue"; +import InfoBoard from "./../InfoBoard" export default { name: 'RoadAndEvents', @@ -48,6 +50,7 @@ export default { ControlCamera, Camera, DrivingGuidance, + InfoBoard, Bg1 }, data() { @@ -61,7 +64,7 @@ export default { // 0 有 可控（球机） ControlCamera | 1 ⽆ 不可控（枪机） Camera component: void 0, data: void 0, - // component: DrivingGuidance, + // component: ControlCamera, // data: { // camId: "57937", // } 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 0a575aef..c40faa9d 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 @@ -33,11 +33,64 @@ export const eventMap = { // status: "0", // }; - const data = await getDeviceList(1); + // const data = await getDeviceList(1); + const data = [ + { + longitude: 116.268564, + latitude: 35.73115, + otherConfig: '{"ptzCtrl":0}', + }, + { + longitude: 116.258178, + latitude: 35.720996, + }, + { + longitude: 116.255542, + latitude: 35.717335, + }, + { + longitude: 116.252883, + latitude: 35.713114, + }, + { + longitude: 116.249416, + latitude: 35.707627, + }, + ]; + + if (!data) return; + + cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.(); + + cacheRemoveFunc.DriveTestEquipment_Camera_Remove = await setMarkToMap.call( + this, + item, + data, + (extData) => { + try { + this.dialogConfig = { + // 0 有（球机） 1 ⽆（枪机） + component: cameraCtrlMap[JSON.parse(extData.otherConfig)?.ptzCtrl], + data: extData, + }; + } catch (error) {} + } + ); + }, + async "路测设备/摄像机_close"() { + cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.(); + }, + async "路测设备/行车诱导_close"() { + cacheRemoveFunc.Driving_Guidance_Remove?.(); + }, + async "路测设备/行车诱导"(item) { + const data = await getDeviceList(12); + // const data = [ // { // longitude: 116.268564, // latitude: 35.73115, + // otherConfig: '{"ptzCtrl":0}', // }, // { // longitude: 116.258178, @@ -54,43 +107,60 @@ export const eventMap = { // { // longitude: 116.249416, // latitude: 35.707627, - // ptzCtrl: 0, // }, // ]; if (!data) return; - cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.(); + cacheRemoveFunc.Driving_Guidance_Remove?.(); - cacheRemoveFunc.DriveTestEquipment_Camera_Remove = await setMarkToMap.call( + cacheRemoveFunc.Driving_Guidance_Remove = await setMarkToMap.call( this, item, data, (extData) => { - try { - this.dialogConfig = { - // 0 有（球机） 1 ⽆（枪机） - component: cameraCtrlMap[JSON.parse(extData.otherConfig)?.ptzCtrl], - data: extData, - }; - } catch (error) {} + this.dialogConfig = { + component: "DrivingGuidance", + data: extData, + }; } ); }, - async "路测设备/摄像机_close"() { - cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.(); + async "路测设备/情报板_close"() { + cacheRemoveFunc.Info_Board_Remove?.(); }, - async "路测设备/行车诱导_close"() { - cacheRemoveFunc.Driving_Guidance_Remove?.(); - }, - async "路测设备/行车诱导"(item) { - const data = await getDeviceList(12); + async "路测设备/情报板"(item) { + const data = await getDeviceList(2); + + // const data = [ + // { + // longitude: 116.268564, + // latitude: 35.73115, + // otherConfig: '{"ptzCtrl":0}', + // }, + // { + // longitude: 116.258178, + // latitude: 35.720996, + // }, + // { + // longitude: 116.255542, + // latitude: 35.717335, + // }, + // { + // longitude: 116.252883, + // latitude: 35.713114, + // }, + // { + // longitude: 116.249416, + // latitude: 35.707627, + // }, + // ]; if (!data) return; - cacheRemoveFunc.Driving_Guidance_Remove?.(); + cacheRemoveFunc.Info_Board_Remove?.(); - cacheRemoveFunc.Driving_Guidance_Remove = await setMarkToMap.call( + cacheRemoveFunc.Info_Board_Remove = await setMarkToMap.call( this, item, data, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue index b75a40fb..169bdf1d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue @@ -15,7 +15,7 @@ - +