fix(front): 地理位置列表加入告警状态

@@ -28,6 +28,7 @@ export interface DeviceModel {
   deviceInfo: any;
   deviceInfo: any;
   activeTime: string;
   activeTime: string;
   deviceState: DeviceState;
   deviceState: DeviceState;
+  alarmStatus: number;
   profileId: string;
   profileId: string;
   label: string;
   label: string;
   lastConnectTime: string;
   lastConnectTime: string;

@@ -79,18 +79,24 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '名称',
     title: '名称',
     dataIndex: 'name',
     dataIndex: 'name',
-    width: 100,
+    width: 120,
+  },
+  {
+    title: '设备状态',
+    dataIndex: 'deviceState',
+    width: 80,
+    slots: { customRender: 'deviceState' },
   },
   },
   {
   {
     title: '位置',
     title: '位置',
     dataIndex: 'deviceInfo.address',
     dataIndex: 'deviceInfo.address',
-    width: 100,
+    width: 120,
   },
   },
   {
   {
-    title: '状态',
-    dataIndex: 'deviceState',
-    width: 100,
-    slots: { customRender: 'deviceState' },
+    title: '告警状态',
+    dataIndex: 'alarmStatus',
+    width: 80,
+    slots: { customRender: 'alarmStatus' },
   },
   },
 ];
 ];
 
 

@@ -23,6 +23,11 @@
             }}
             }}
           </Tag>
           </Tag>
         </template>
         </template>
+        <template #alarmStatus="{ record }">
+          <Tag :color="record.alarmStatus == 1 ? 'warning' : 'success'" class="ml-2">
+            {{ record.alarmStatus == 1 ? '告警' : '正常' }}
+          </Tag>
+        </template>
       </BasicTable>
       </BasicTable>
     </div>
     </div>
     <BasicModal
     <BasicModal
@@ -223,7 +228,7 @@
           const { longitude, latitude, address } = record.deviceInfo;
           const { longitude, latitude, address } = record.deviceInfo;
           const point = new BMap.Point(longitude, latitude);
           const point = new BMap.Point(longitude, latitude);
           let options = {
           let options = {
-            width: 300, // 信息窗口宽度
+            width: 330, // 信息窗口宽度
             height: 230, // 信息窗口高度
             height: 230, // 信息窗口高度
           };
           };
           map.centerAndZoom(point, 15);
           map.centerAndZoom(point, 15);
@@ -438,7 +443,7 @@
   }
   }
   .right-wrap {
   .right-wrap {
     padding-top: 10px;
     padding-top: 10px;
-    width: 22%;
+    width: 28%;
     height: 95%;
     height: 95%;
     position: absolute;
     position: absolute;
     right: 5%;
     right: 5%;