Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/supermap/map-showResource.js

@@ -83,11 +83,12 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
             maxClusterRadius: 80,
         })
         markerClusterLayer.on('clusterclick', function(a) {
-            //console.log('cluster ' + a.layer.getAllChildMarkers().length);
+            //console.log('cluster ' + a.layer.getAllChildMarkers());
             if (a.layer.getAllChildMarkers().length < 50) {
                 let clusterList = [];
                 for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
                     //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
+                    //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);
                     clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
                 }
                 //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));

front/src/views/home/components/H5Player.vue

@@ -67,6 +67,7 @@ import { message } from 'ant-design-vue'
                 handler(newVal, oldVal) {
                     console.log('oldVal:', oldVal)
                     console.log('newVal:', newVal)
+                   //this.realplay(newVal,0);   
                 },
                 // 立即处理 进入页面就触发
                 immediate: true

front/src/views/home/videoSurveillance/index.vue

@@ -551,7 +551,7 @@ import { ElMessage } from 'element-plus'
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
         pageNum: "1",
-        pageSize: 30000,
+        pageSize: 40000,
         type: 0,
         borderPolygonList: []
         }