11

src/components/Map/location/LocationMapss.vue

@@ -197,14 +197,17 @@ export default {
 
     methods: {
         async getAreas() {
-            if (!this.areaId) return
+            // 如果没有 areaId,直接初始化地图
+            if (!this.areaId) {
+                this.initAMap();
+                return;
+            }
 
+            // 有 areaId 时获取区域信息
             getArea(this.areaId).then(response => {
-
                 console.log(response, 'responseresponse');
                 this.area = response.data;
 
-
                 listParking({ areaId: this.area.areaId }).then(response => {
                     let list = response.rows;
                     console.log(list, 'listlistlist');
@@ -291,6 +294,9 @@ export default {
             this.removeAllMarker()
             if (this.currentLng != null && this.currentLat != null) {
                 this.updateTrackData()
+                
+                // 只有在有区域信息时才添加区域和停车场
+                if(this.area) {
                     this.addArea(JSON.parse(this.area.boundaryStr) || []);
                     //停车区
                     this.parkingList.forEach(parking => {
@@ -307,6 +313,9 @@ export default {
                         this.addNoriding(JSON.parse(noriding.boundaryStr) || [], noriding.parkingName, noriding.longitude, noriding.latitude);
                         this.addMarker2(noriding, "https://lxnapi.ccttiot.com/FmX1diEPPbFYe1vcUfKp6qbKzzh2", noriding.parkingName, "#ffcc00");
                     });
+                }
+                
+                // 无论是否有区域信息都添加设备标记
                 this.addMarker(this.currentLng, this.currentLat, this.deviceSn, this.deviceInfo.status, this.deviceInfo.onlineStatus)
             }
         },

src/views/system/device/device_detail.vue

@@ -44,8 +44,8 @@
             <div class="info-row">
               <div class="info-item">
                 <span class="label">电门：</span>
-                <el-tag :type="deviceInfo.powerStatus === '1' ? 'success' : 'danger'" size="small">
-                  {{ deviceInfo.powerStatus === '1' ? '开' : '关' }}
+                <el-tag :type="deviceInfo.quality === '1' ? 'success' : 'danger'" size="small">
+                  {{ deviceInfo.quality === '1' ? '开' : '关' }}
                 </el-tag>
                 <!-- <span class="value">{{ deviceInfo.quality || '-' }}</span> -->
               </div>