Parcourir la source

Merge branch 'all-v4-lhf' into 'all-v4'

[相机布局] 修复添加到小地图的相机当处于未接入平台时不显示问题

See merge request skyeye/skyeye_frontend/skyeye-admin!365
楼航飞 il y a 1 an
Parent
commit
5769e9d5ac
1 fichiers modifiés avec 4 ajouts et 15 suppressions
  1. 4 15
      src/views/map-config/mini-map/MiniMapConfig.vue

+ 4 - 15
src/views/map-config/mini-map/MiniMapConfig.vue

@@ -135,9 +135,9 @@
   function updataState(data, updateData) {
     for (let i = 0; i < data.length; i++) {
       const camera = data[i];
-      const matchedCamera = updateData.find((item) => item.cameraCode === camera.code);
+      const matchedCamera = updateData.find((item) => item.code === camera.code);
       if (matchedCamera) {
-        camera.status = matchedCamera.status;
+        camera.status = matchedCamera.networkingState;
         camera.integrationState = matchedCamera.integrationState;
       }
     }
@@ -456,15 +456,11 @@
     }
 
     &__list {
-      display: flex;
-      justify-content: space-between;
       align-items: center;
-      width: 100%;
-      height: 32px;
+      margin: 10px 0;
       font-size: 14px;
       font-weight: 400;
       color: #404040;
-      line-height: 14px;
       cursor: pointer;
 
       &:hover {
@@ -472,15 +468,8 @@
         color: #1890ff;
       }
 
-      .camera-id {
-        width: 110px;
-      }
-
       .camera-space {
-        width: 120px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        margin-left: 12px;
       }
     }
   }