From 119c61d55e56444095ed9438906f85ef175a4433 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei124@hisense.com>
Date: Wed, 7 Dec 2022 10:53:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F=E7=B2=BE?=
 =?UTF-8?q?=E7=BB=86=E5=8C=96=E7=AE=A1=E7=90=86-=E5=95=86=E4=B8=9A?=
 =?UTF-8?q?=E8=A1=97=E5=8C=BA=E7=83=AD=E5=8A=9B=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../areaMonitor/components/EarlyWarning.vue   |  4 +-
 src/views/pages/areaMonitor/index.vue         | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/areaMonitor/components/EarlyWarning.vue b/src/views/pages/areaMonitor/components/EarlyWarning.vue
index eb47037..463ddf5 100644
--- a/src/views/pages/areaMonitor/components/EarlyWarning.vue
+++ b/src/views/pages/areaMonitor/components/EarlyWarning.vue
@@ -166,7 +166,7 @@ export default {
                 },
             ],
             eventListData: [],
-            total:0,
+            total:6,
             pageSize:6,
             currentPage:1,
         
@@ -200,7 +200,7 @@ export default {
                 let resdata=res.data.data;
                 this.dateTabs[1].dataNum=resdata.length;
                 // this.eventListData = res.data;
-                this.total = res.count;
+                // this.total = res.data.count;
                 // console.log("执行函数111");
                 //获取参数重新编辑
                 $.ajax({
diff --git a/src/views/pages/areaMonitor/index.vue b/src/views/pages/areaMonitor/index.vue
index 4ec4068..0736706 100644
--- a/src/views/pages/areaMonitor/index.vue
+++ b/src/views/pages/areaMonitor/index.vue
@@ -166,6 +166,9 @@ import { selectByAreaEvent, selectKeyArea } from "@/api/area";
 import { gcjLL2wgs84LL } from "@/utils/coordinateSystemTransform";
 // 时间轴
 import HorizonTimeLine from "./components/HorizonTimeLine";
+import {
+    crowflowList,
+} from "@/api/areaMonitor";
 export default {
   data() {
     return {
@@ -549,6 +552,8 @@ export default {
                     this.hiMapFun.addAreaToMap(areaLatLng);
                   }
                 });
+                // 商业街区热力图上图。
+                this.shoppingMallThermodynamic();
               } else {
                 const dataEvent = [];
                 res.data.data.forEach((item) => {
@@ -579,6 +584,7 @@ export default {
           case "窗口单位":
             if (item === "商业街区") {
               this.hiMapFun.removerPolygon();
+              this.hiMapFun.removeLayerByLayerName("shoppingMallLayer");
             }
             this.hiMapFun.removeLayerByLayerName(item);
             break;
@@ -616,6 +622,43 @@ export default {
         createCameraDetailsPop
       );
     },
+    // 商业街区热力图上图。
+    async shoppingMallThermodynamic(){
+          // 查询检测预警。
+        const params = {
+            page: 1,
+            size: 500,
+            needAreaData:true,
+        };
+        // console.log("执行函数");
+        let shoppingMallList=await crowflowList(params);
+        let smList=shoppingMallList.data.data;
+        let smListLength=smList.length;
+        let smOnMapData=[];
+        for(let i=0; i<smListLength; i++){
+           if(smList[i].totalAreaData){
+            var jsonData = JSON.parse(smList[i].totalAreaData);//第一种
+            // console.log("smList[i].totalAreaData",jsonData)
+            for(let key in jsonData) {
+                let latlonVal=[];
+                // console.log(jsonData[key]) // foo, bar
+                let keyArr=key.split("_");
+                latlonVal.push(keyArr[1]);
+                latlonVal.push(keyArr[0]);
+                latlonVal.push(jsonData[key]);
+                // console.log("smList[i]xxxx",latlonVal)
+                smOnMapData.push(latlonVal);
+            }
+           }
+        }
+        // console.log("smList[i]xxxx",smOnMapData)
+        this.hiMapFun.removeLayerByLayerName("shoppingMallLayer");
+        this.hiMapFun.thermodynamic(
+          smOnMapData,
+          25,
+          "shoppingMallLayer"
+        );
+    },
 
     thermodynamic() {
       let dataNumber = [];
@@ -684,6 +727,7 @@ export default {
       this.thermodynamicPeopleType = "";
     },
     changeThermodynamicPeopleType(value) {
+      console.log("热力图上图数据",this.thermodynamicPeopleAll);
       this.hiMapFun.removeLayerByLayerName("types");
       switch (value) {
         case "all":
@@ -730,6 +774,7 @@ export default {
       this.hiMapFun.removeLayerByLayerName("景区景点");
       this.hiMapFun.removeLayerByLayerName("海水浴场");
       this.hiMapFun.removeLayerByLayerName("窗口单位");
+      this.hiMapFun.removeLayerByLayerName("shoppingMallLayer"); //商业街区热力图
       //清除地图底部的、地图显示、重点区域、人流热力
       this.changeLayerBtnGroup=[];
       this.thermodynamicPeopleType = "";