Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

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

@@ -46,7 +46,7 @@ export default {
     this.aMapIns = new this.AMap.Map(this.$refs.mapContainerRef, {
       resizeEnable: true, //是否监控地图容器尺寸变化
       mapStyle: "amap://styles/blue",
-      zoom: 9,
+      zoom: 7,
       center: [116.629514, 35.794168],
     });
 
@@ -105,7 +105,7 @@ export default {
     });
 
     //画线
-    function drawingLine(AMap, datas, borderWeight = 1,strokeWeight = 0, olColor = "#00B3CC") {
+    function drawingLine(AMap, datas, borderWeight = 1, strokeWeight = 0, olColor = "#00B3CC") {
       return new AMap.Polyline({
         path: datas,
         isOutline: true,
@@ -126,7 +126,7 @@ export default {
 
     //画车道
     // let jhPolyline;
-    function drawJHPath(AMap, lczPointList,borderWeight = 1,strokeWeight = 60) {
+    function drawJHPath(AMap, lczPointList, borderWeight = 1, strokeWeight = 60) {
       return new AMap.Polyline({
         path: lczPointList,            // 设置线覆盖物路径
         showDir: true,
@@ -146,47 +146,47 @@ export default {
 
     //画车道线
     function createCanvas() {
-        let canvasDir = document.createElement('canvas')
-        let width = 150;
-        let height = 150;
-
-        canvasDir.width = width;
-        canvasDir.height = height;
-        var context = canvasDir.getContext('2d');
-        context.strokeStyle = '#C4C6C7';
-        context.lineJoin = 'round';
-        context.lineWidth = 5;
-
-        //左边实线
-        // context.moveTo(5, 0);
-        // context.lineTo(5, height);
-        //左边虚线
-        context.moveTo(35, 0);
-        context.lineTo(35, 50);
-        context.moveTo(35, 100);
-        context.lineTo(35, 150);
-        //中间虚线
-        context.moveTo(75, 20);
-        context.lineTo(75, 70);
-        context.moveTo(75, 120);
-        context.lineTo(75, 170);
-        //右边虚线
-        context.moveTo(115, 0);
-        context.lineTo(115, 50);
-        context.moveTo(115, 100);
-        context.lineTo(115, 150);
-        //最右侧实线
-        // context.moveTo(width - 5, 0);
-        // context.lineTo(width - 5, height);
-        
-        context.stroke();
-
-        // 绘制一个填充矩形
-        // context.fillStyle = "red";
-        // context.fillRect(0, 0, width, height);
-
-        return canvasDir;
-      }
+      let canvasDir = document.createElement('canvas')
+      let width = 150;
+      let height = 150;
+
+      canvasDir.width = width;
+      canvasDir.height = height;
+      var context = canvasDir.getContext('2d');
+      context.strokeStyle = '#C4C6C7';
+      context.lineJoin = 'round';
+      context.lineWidth = 5;
+
+      //左边实线
+      // context.moveTo(5, 0);
+      // context.lineTo(5, height);
+      //左边虚线
+      context.moveTo(35, 0);
+      context.lineTo(35, 50);
+      context.moveTo(35, 100);
+      context.lineTo(35, 150);
+      //中间虚线
+      context.moveTo(75, 20);
+      context.lineTo(75, 70);
+      context.moveTo(75, 120);
+      context.lineTo(75, 170);
+      //右边虚线
+      context.moveTo(115, 0);
+      context.lineTo(115, 50);
+      context.moveTo(115, 100);
+      context.lineTo(115, 150);
+      //最右侧实线
+      // context.moveTo(width - 5, 0);
+      // context.lineTo(width - 5, height);
+
+      context.stroke();
+
+      // 绘制一个填充矩形
+      // context.fillStyle = "red";
+      // context.fillRect(0, 0, width, height);
+
+      return canvasDir;
+    }
 
     // this.aMapIns.enableAutoResize();
   },

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

@@ -13,8 +13,11 @@
         <div>当前在途车辆</div>
       </div>
       <div class="monitor-item">
-        <span>4618</span>
-        <div>当前在途车辆</div>
+        <div>
+          <span class="abnormal">0</span>
+          <span>/0</span>
+        </div>
+        <div>交通事件</div>
       </div>
       <div class="monitor-item">
         <span>0</span>

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

@@ -41,7 +41,14 @@ export const eventMap = {
       .get("/system/camera/camList")
       // .get("/system/dept/camTreeselect")
       .catch(() => ({}));
-    // const { code, data } = { code: 200, data: [] };
+    // const { code, data } = {
+    //   code: 200,
+    //   data: [
+    //     {
+    //       pileNum: "K55+565",
+    //     },
+    //   ],
+    // };
 
     if (code != 200) return Message.error("摄像机加载失败!");
 
@@ -87,7 +94,7 @@ export const eventMap = {
     //   code: 200,
     //   data: [
     //     {
-    //       pileNum: "K55+0",
+    //       stakeMarkId: "K176+167",
     //     },
     //   ],
     // };
@@ -119,7 +126,7 @@ export const eventMap = {
       }
     );
 
-    if (noneLocation) Message.warning("匹配到诱导设备位置!");
+    if (noneLocation) Message.warning("未能匹配到诱导设备位置!");
     // cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
   },
 };

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

@@ -25,7 +25,7 @@ export async function setMarkerCluster(map, points, markerFun) {
 
   let hasClick = false;
 
-  if (!points.length) Message.warning("匹配到对应坐标点");
+  if (!points.length) Message.warning("未能匹配到对应坐标点");
 
   const markerCluster = new AMap.MarkerCluster(map, points, {
     // gridSize: 15,