wenhongquan 3 rokov pred
rodič
commit
d53f6ab73f

+ 1 - 0
src/api/resource.ts

@@ -119,6 +119,7 @@ export interface SingleDeviceItem {
   extendInfo?: null;
   deviceExtendInfo?: null;
   channelId?: string;
+  isOnline?: boolean;
 }
 
 export interface AllResourcesResponse {

BIN
src/assets/icons/detail/monitor_offline@2x.png


BIN
src/assets/icons/home/monitor_offline@2x.png


+ 36 - 0
src/assets/icons/home/spjkoffline.svg

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="50px" viewBox="0 0 48 50" enable-background="new 0 0 48 50" xml:space="preserve">  <image id="image0" width="48" height="50" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAyCAQAAACww5AHAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElN
+RQfmAhITCAkjfLHOAAAEJ0lEQVRYw62XXUybVRjHf+ft21mYbG0ACUxjMGQBJgEnitGxyAyGu27q
+jCO4jECLd0vQGG8WZ3ZDjHixZRe0EBIkzIgGlhgvXJwkzihjRrEy0EwZqZMLt1DGhx0fPV5QSl94
+v1r496bnnOf5/5/nec+nkFihPyNSK2soFkXSI7JAzokZeYsJ8a37yvH/rLyFmUCfZ8ErvbxMpoHB
+Il+Ly7sv18+kIRDIFK28K7MsE0TM8aH82L+YgkC/Y7YpdpZ8a/IEppWze7uOr9oS6NkXHaQyBfJ1
+3HAdPXnHUiBQxUBKsWvy4Jh/WNulaJudDWIobXrIF0OdDSYZdDbEPkmbfCPmN5t7dQUCVWJIurYv
+IKLyxY1CJQR69kVHtlEcLaZdz6x/7vg36HdEB3eMHvKjg/0OjcBsU1oT0xiVs01JJQpkcsssfjd1
+rBLiD2IplIki/2I8A9FqXp7n2YOHw9RTwS7bZRKt8Qz6PAtTZntODq8ktZYYJ8Qi1hBzux+vn1Fg
+wWu+pVVoWrso5wSH2WspILMWvKCA9JqZ7aFwS5+DYl6nlkesJLwgPsuYuWu43wPVlJhQ/MMoYePh
+RU+OGqk1o89gv2mMBRRwj1H+RPdcyYzUKrLGjKAMB1bI5ghvcABVr0g1KsXmEdpDFi/wNL8xxgPt
+QLEiiswcb7BkUwJcVGomNIAoUqTHzOlv+rhua9YD3Oe7zSXyiMADabk4FfZTbjHzVxnlZzYfymJJ
+lVH91e9livF4RWNMMEEhFeQa0If5nvs6n1lGVRGWB/Rc8sjjICFGEj2TTFJABY9uspznBybJpY4r
+W1hEWJVhdAUAVJ4iRDTeOkgmv/IV2ZTzRHyfjxHiJxwcooQRtt5aZFhljDqz2qoIAJyU8RAlfMk0
+VxmhlGxmGSOCkzryWOKmnvuY6KjiR70Rv67cPJ/qnAmCQlz6As8p/mFuYxsh3SNH8pc+/W3/sAKi
+F5u4o09jCNELKjjbl94ix8joEguJOK2v+hrcdbaDAqci4oyx1TKx+C9FesSZU5H4mewOEtIzWeGX
+xCRNGSF3EBIXr+7S5WEeTh4/yhTj6dPPO6sabyYJQPAYX0iRLt+m4khe9Q2s/U/crn0DnNsZeuDc
+Or32di2CHdK3A/EHfS0bMyL5fSB9LZzfNv/5ZPrNDxDpP03btujb/Ke181nnjRZ8hzZpfdZvLc0q
+7/k+2tKrt3y6Xopdkrk2OJOJ/lVONH2j06+/PrsfW/lcPpsC/XX1tUbdG5ii79AYdldzUdjaHYTk
+oru6MWw4aozOI7JTFmIKMSmam68ajytmzs1XXWXignEMQooLrjIzeosM1hA4JLqk3hX1d5r916y8
+FSsD8F+TT9IqIpq4IrRSZk1vK4M19GRHP6AFFVihw/X+yXv2/GwLAHSXLreD8+3GFE7O/wFn300Z
+4QtDRQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMi0wMi0xOFQxMTowODowOSswODowMKGv6LQAAAAl
+dEVYdGRhdGU6bW9kaWZ5ADIwMjItMDItMThUMTE6MDg6MDkrMDg6MDDQ8lAIAAAAEXRFWHRleGlm
+OkNvbG9yU3BhY2UAMQ+bAkkAAAASdEVYdGV4aWY6RXhpZk9mZnNldAAyNlMbomUAAAAXdEVYdGV4
+aWY6UGl4ZWxYRGltZW5zaW9uADQ4JzgYzgAAABd0RVh0ZXhpZjpQaXhlbFlEaW1lbnNpb24ANTDt
+bng4AAAAIHRFWHRzb2Z0d2FyZQBodHRwczovL2ltYWdlbWFnaWNrLm9yZ7zPHZ0AAAAYdEVYdFRo
+dW1iOjpEb2N1bWVudDo6UGFnZXMAMaf/uy8AAAAXdEVYdFRodW1iOjpJbWFnZTo6SGVpZ2h0ADUw
+kKA+XgAAABZ0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAA0OH/PR6AAAAAZdEVYdFRodW1iOjpNaW1l
+dHlwZQBpbWFnZS9wbmc/slZOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTY0NTE1MzY4OXD84xsAAAAS
+dEVYdFRodW1iOjpTaXplADE5MjVCQnD4oVwAAABHdEVYdFRodW1iOjpVUkkAZmlsZTovLy9hcHAv
+dG1wL2ltYWdlbGMvaW1ndmlldzJfOV8xNjM4ODQ4MDM1OTA1MTY3N18yNjVfWzBdBkPLZwAAAABJ
+RU5ErkJggg==" ></image>
+</svg>

+ 14 - 2
src/components/MarkerMap/index.tsx

@@ -36,6 +36,8 @@ import icon_map_yjck_w from '@/assets/icons/home/icon_map_yjck_w.svg';
 /** @ts-ignore */
 import icon_map_spjk from '@/assets/icons/home/spjk.svg';
 /** @ts-ignore */
+import icon_map_spjk_offline from '@/assets/icons/home/spjkoffline.svg';
+/** @ts-ignore */
 import icon_map_dcz from '@/assets/icons/home/icon_map_dcz.svg';
 /** @ts-ignore */
 import icon_map_dpf from '@/assets/icons/home/dpf.svg';
@@ -493,7 +495,8 @@ export default defineComponent({
       // console.log(state.markers);
       state.markers.push(
         ...markers.map((i) => {
-          const nextImage =
+          
+          var nextImage1 =
             type === '应急事件'
               ? getIncidentImage(i?.status)
               : i.locationType && i.resourceType
@@ -501,7 +504,16 @@ export default defineComponent({
                   i.locationType.toString(),
                   i.resourceType.toString(),
                 )
-              : image;
+                : image;
+          
+          
+          if (type == "视频监控") { 
+            if (i.isOnline == false) { 
+               nextImage1 = icon_map_spjk_offline;
+            }
+          }
+          const nextImage = nextImage1; 
+
           const popup = new window.minemap.Popup({
             anchor: 'left',
             closeOnClick: true,