Merge branch 'master' of http://git.xt.wenhq.top:8083/wimjiang/squi-HD

index.html

@@ -25,7 +25,7 @@
          * key、solution设置
          */
         minemap.key = "d054b0f4433b42f1a28c1a97fbf8317d";
-        minemap.solution = 12887;
+        minemap.solution = 12886;
     </script>
     <script>
         (function(win, lib) {

src/components/MarkerMap/index.tsx

@@ -281,7 +281,7 @@ export default defineComponent({
 
         case '视频监控':
           return GET_VIDEO_DIALOG_HTML(marker, () => {
-            if(marker['status'] == 0){
+            if(marker['status'] == 1){
               const DAHUA = document.getElementById('DAHUA') as HTMLIFrameElement;
               DAHUA?.contentWindow?.postMessage(
                 {

src/store/useMarkerStore.ts

@@ -109,15 +109,15 @@ export default defineStore<'marker', MarkerStateType, {}, MainActionsType>(
           this.toggleLoading();
           const { data } = await getAllvideoDevice();
           let videoData = [];
-          // for(var index in data){
-          //   if(data[index].gpsX){
-          //     console.log(index);
-          //     videoData.push(data[index]);
-          //   }
-          // }
+          for(var index in data){
+            if(data[index].gpsX){
+              console.log(index);
+              videoData.push(data[index]);
+            }
+          }
           this.videoSurveillance = [];
 
-          this.videoSurveillance = Object.values(data).map((item) => ({
+          this.videoSurveillance = Object.values(videoData).map((item) => ({
             ...item,
             locations: `${item.gpsX},${item.gpsY}`,
           }));