修改

liuyg

2021-04-26 3fbef64591ee92b966e9d958a86c4709c69cf35b

 public/map/widgets/supervisoryMap/SupervisoryMap.js

@@ -205,6 +205,7 @@
        dataType: 'JSON',
        success: function (res) {
          var datas = res.data;
          console.log(datas)
          var heatmapRenderer = null;
          that.entityData = [];
          for (var i = 0; i < datas.length; i++) {
@@ -215,7 +216,8 @@
              lttd: Number(datas[i].wd)
            })
          }
          that.flareClusterLayer(datas);
          // that.flareClusterLayer(datas);
          console.log(datas)
          that.heatmapfeatureLayer = that.heatmFeaLayers();
          that._map.addLayer(that.heatmapfeatureLayer);
          // that.checkBoxSelect();//左侧控制热力图重复
@@ -256,7 +258,7 @@
          });
        });
        that.getArea($('#policeArea'));
        that.getPoliceTableAnalysis($('.analysis-container-police').find('.tbody tbody'), time.tomorrow, time.current, '', '');
        // that.getPoliceTableAnalysis($('.analysis-container-police').find('.tbody tbody'), time.tomorrow, time.current, '', '');
        that.clickHand();

      }
@@ -267,7 +269,7 @@
      objThis._map.addLayer(objThis._siteLayer);
      var that = this;
      // console.log(mySelf.clusterLayer)
      that.getEquipmentTable($('.analysis-container-equipment').find('.tbody tbody'), '');
      that.getEquipmentTable($('.analysis-container-equipment').find('.tbody tbody'), '','once');
      // 顶部tab得切换事件
      $('.analysis-and-judgment-tab li').click(function () {
        // if (that.tabIndex == $(this).index()) return;
@@ -850,6 +852,7 @@
          var oldData = data.data.records
          var result = oldData;
          that.Pdata = oldData;
          console.log(that.Pdata);//警情筛选
          var str = '';
          that.entitysData = [];
          that.analysisAddEntitys.clear();
@@ -949,7 +952,7 @@
        success: function (data) {
          // var result = data.data;
          var oldData = data.data;
          console.log(oldData)
          // console.log(oldData)
          var result = oldData;
          that.Ydata = oldData;
          var str = '';
@@ -986,11 +989,14 @@
            }

          }


          console.log(that.Ydata);//业主筛选
        }
      })
    },
    // 获取设备信息列表
    getEquipmentTable: function (dom, deviceType) {
    getEquipmentTable: function (dom, deviceType,once) {
      dom.empty();
      var that = this;
      // console.log(that.clusterLayer)
@@ -1014,7 +1020,7 @@
          var oldData = data.data;
          var result = [];
          that.Sdata = oldData;
          // console.log(result)
          
          var str = '';
          that.entitysData = [];
          that.analysisAddEntitys.clear();
@@ -1051,7 +1057,18 @@
              }
            }
          }

          if(once != 'once'){
            for (var i = 0; i < result.length; i++) {
              result[i].x = Number(result[i].jd);
              result[i].y = Number(result[i].wd);
              that.entityData.push({
                lgtd: Number(result[i].jd),
                lttd: Number(result[i].wd)
              })
            }
            console.log(result);//设备筛选
          that.flareClusterLayer(result);
          }

          for (var a, i = 0; i < result.length; i++) {
            that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '设备信息', {