修改提交

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue

@@ -1,11 +1,15 @@
 <template>
   <Dialog v-model="obverseVisible" title="行车诱导">
     <div class="DrivingGuidance">
-      <CustomControlVideo class="camera-video" />
+      <!-- <CustomControlVideo class="camera-video" /> -->
 
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="详细设计" name="first">
-          <Descriptions :list="list" :data="data" style="gap: 18px" />
+          <Descriptions :list="list" :data="dialogData" style="gap: 18px">
+            <template #direction>
+              {{ { 1: '上行(菏泽方向)', 2: '中', 3: '下行(济南方向)' }[dialogData.direction] }}
+            </template>
+          </Descriptions>
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">摄相机参数</ElTabPane>
       </ElTabs>
@@ -15,7 +19,7 @@
       </div>
     </div>
 
-    <DeviceControlDialog v-model="deviceControlVisible" />
+    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" />
   </Dialog>
 </template>
 
@@ -25,6 +29,7 @@ import Button from "@screen/components/Buttons/Button.vue"
 import Descriptions from '@screen/components/Descriptions.vue';
 import CustomControlVideo from '@screen/components/CustomControlVideo/index.vue';
 import DeviceControlDialog from "./components/DeviceControlDialog.vue"
+import request from "@/utils/request";
 
 import { dialogDelayVisible } from "./../mixin"
 
@@ -53,12 +58,13 @@ export default {
       },
       list: [
         {
-          label: '设备类型',
+          label: '设备名称',
-          key: "deviceType",
+          key: "deviceName",
         },
         {
           label: '设备桩号',
-          key: "deviceStation",
+          // key: "deviceStation",
+          key: "stakeMarkId",
         },
         {
           label: '道路名称',
@@ -66,11 +72,11 @@ export default {
         },
         {
           label: '设备方向',
-          key: "deviceDirection",
+          key: "direction",
         },
         {
           label: '设备状态',
-          key: "deviceStatus",
+          key: "useState",
         },
         {
           label: '设备厂商',
@@ -79,6 +85,22 @@ export default {
       ]
     }
   },
+  // watch: {
+  //   v: {
+  //     immediate: true,
+  //     handler() {
+  //       request({
+  //         url: `/business/stakeMark/${this.dialogData.stakeMarkId}`,
+  //         method: "get",
+  //       })
+  //         .then((result) => {
+  //           console.log(result)
+  //         }).catch((err) => {
+
+  //         });
+  //     }
+  //   }
+  // },
   methods: {
     handleClickTabs() { }
   }
@@ -88,7 +110,7 @@ export default {
 <style lang='scss' scoped>
 .DrivingGuidance {
   width: 600px;
-  height: 510px;
+  height: 240px;
   color: #fff;
   display: flex;
   flex-direction: column;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@@ -1,5 +1,6 @@
 import { axiosIns } from "@screen/utils/axios/auth.js";
 import { Message } from "element-ui";
+import request from "@/utils/request";
 
 const PilePointJSON = require(`@screen/pages/Home/components/AMapContainer/data/lcz.json`);
 
@@ -73,13 +74,25 @@ export const eventMap = {
     cacheRemoveFunc.Driving_Guidance_Remove?.();
   },
   async "路测设备/行车诱导"(item) {
-    const { code, data } = await axiosIns
+    const { code, data } = await request({
-      .get("/system/camera/camList")
+      url: "/business/device/query",
+      method: "get",
+      params: {
+        deviceType: 12,
+      },
+    })
       // .get("/system/dept/camTreeselect")
       .catch(() => ({}));
-    // const { code, data } = { code: 200, data: [] };
+    // const { code, data } = {
+    //   code: 200,
+    //   data: [
+    //     {
+    //       pileNum: "K55+0",
+    //     },
+    //   ],
+    // };
 
-    if (code != 200) return Message.error("摄像机加载失败!");
+    if (code != 200) return Message.error("行车诱导设备加载失败!");
 
     cacheRemoveFunc.Driving_Guidance_Remove?.();
 
@@ -88,7 +101,7 @@ export const eventMap = {
       item,
       data,
       (item) => {
-        const { lng, lat } = PilePointJSON[item.pileNum] || {};
+        const { lng, lat } = PilePointJSON[item.stakeMarkId] || {};
 
         return {
           lnglat: [lng, lat],