From 63635ad736657a66424bd6e92576cac5c31c99d3 Mon Sep 17 00:00:00 2001
From: gounaikang <gounaikang@hisense.com>
Date: Tue, 6 Dec 2022 16:15:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=A7=AF=E6=B0=B4=E7=82=B9=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/waterPoints/components/SiteList.vue | 2 +-
 src/views/pages/waterPoints/index.vue               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/waterPoints/components/SiteList.vue b/src/views/pages/waterPoints/components/SiteList.vue
index 52a448e..cf6532c 100644
--- a/src/views/pages/waterPoints/components/SiteList.vue
+++ b/src/views/pages/waterPoints/components/SiteList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div class="title"><p>积水点级别分析</p><div class="bottomLine"></div></div>
+    <div class="title"><p>积水点级别分析(水务局)</p><div class="bottomLine"></div></div>
     <!-- <div class="title"><p>易积水点市区分布</p><div class="bottomLine"></div></div> -->
     <!-- 工地列表 -->
     <div class="eventData">
diff --git a/src/views/pages/waterPoints/index.vue b/src/views/pages/waterPoints/index.vue
index 6d9b80a..96a304b 100644
--- a/src/views/pages/waterPoints/index.vue
+++ b/src/views/pages/waterPoints/index.vue
@@ -511,7 +511,7 @@ export default {
     position: relative;
     z-index: 1000;
     width: 100%;
-    height: 166px;
+    height: 90px;
     background: url('~@/assets/construction/title.png') no-repeat;
     text-align: center;
     .title {

From c850ba6e9c7a75761ef1328be897a9a5c6e2e1a4 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei124@hisense.com>
Date: Wed, 7 Dec 2022 09:52:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E7=B2=BE=E7=BB=86=E5=8C=96=E7=AE=A1=E7=90=86=20=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/supermap/advance-init.js                  |  2 +-
 .../areaMonitor/components/SiteListMore.vue   | 25 +++++++++++++++---
 .../areaMonitor/components/VideoListRight.vue | 26 ++++++++++++++++---
 src/views/pages/areaMonitor/index.vue         | 17 +++++++++---
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/supermap/advance-init.js b/src/supermap/advance-init.js
index 8405fcd..02bfec4 100644
--- a/src/supermap/advance-init.js
+++ b/src/supermap/advance-init.js
@@ -156,7 +156,7 @@ export function MapFun(mapObj) {
                 }
             } else if (feature.type == 'eventList') {
                 const elementHtml = createEventListDetailsPopNew(feature)
-                L.popup({ className: 'Event-List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
+                L.popup({ className: 'Event-List-Details-pop', offset: [0, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
             } else if (feature.type == 'eventTwoList') {
                 const elementHtml = createImportantAreaPopNew(feature)
                 L.popup({ className: 'Event-List-Details-pop', offset: [168, 200] }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map)
diff --git a/src/views/pages/areaMonitor/components/SiteListMore.vue b/src/views/pages/areaMonitor/components/SiteListMore.vue
index a61c3b6..8bf8918 100644
--- a/src/views/pages/areaMonitor/components/SiteListMore.vue
+++ b/src/views/pages/areaMonitor/components/SiteListMore.vue
@@ -1,9 +1,10 @@
 <template>
     <div class="box">
       <div class="title">重点区域列表</div>
+      <div class="title-close" @click="handleClose"><i class="el-icon-close"></i></div>
       <!-- 工地列表 -->
       <div class="eventData">
-        <div style="display: flex;justify-content: space-between">
+        <div style="display: flex;">
           <el-input
             placeholder="请输入区域名称"
             prefix-icon="el-icon-search"
@@ -11,14 +12,14 @@
             v-model="searchValue"
           >
           </el-input>
-          <el-select v-model="selectAreaValue" placeholder="全部" @change="fliterSiteByArea">
+          <!-- <el-select v-model="selectAreaValue" placeholder="全部" @change="fliterSiteByArea">
             <el-option
               v-for="item in areaOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value">
             </el-option>
-          </el-select>
+          </el-select> -->
           <el-select v-model="selectValue" placeholder="全部" @change="fliterSiteByArea">
             <el-option
               v-for="item in options"
@@ -163,6 +164,10 @@ import { createImportantAreaPopNew } from '../../../../supermap/createMarkerPopu
       })
     },
     methods: {
+      // 关闭重点区域。
+      handleClose(){
+        this.$emit("closeSiteListMore");
+      },
       searchSite() {
         if (!this.searchValue && this.selectValue !== '全部') {
            selectKeyArea({ type: this.selectValue }).then((res) => {
@@ -224,6 +229,9 @@ import { createImportantAreaPopNew } from '../../../../supermap/createMarkerPopu
             let lonLat = gcjLL2wgs84LL(item[0], item[1]);
             areaLatLng.push([lonLat[1],lonLat[0]])
           })
+          //跳转到响应的位置。
+          let lonLat=arr[0];
+          this.$parent.hiMap.mapObj.map.flyTo({ lat: lonLat[1], lng:lonLat[0] },14);
           this.$parent.hiMapFun.addAreaToMap(areaLatLng)
         }
         // else {
@@ -255,15 +263,26 @@ import { createImportantAreaPopNew } from '../../../../supermap/createMarkerPopu
     background: url(../../../../assets/construction/listTopBg.png) no-repeat,
                 url(../../../../assets/construction/siteTag.png) no-repeat 507px 17px;
     padding: 30px 0 18px 14px;
+    position: relative;
     .title {
       color: #fff;
       font-size: 20px;
     }
+    .title-close{
+      position: absolute;
+      right:10px;
+      top: 10px;
+      cursor: pointer;
+      .el-icon-close:before {
+          color:#fff;
+      }
+    }
     ::v-deep .eventData {
       width: 544px;
       margin-top: 14px;
       .el-input {
         width: 200px;
+        margin-right: 10px;
       }
       .el-input__inner {
         border: 1px solid rgba(31,254,253,.9);
diff --git a/src/views/pages/areaMonitor/components/VideoListRight.vue b/src/views/pages/areaMonitor/components/VideoListRight.vue
index 39f9f8c..9384294 100644
--- a/src/views/pages/areaMonitor/components/VideoListRight.vue
+++ b/src/views/pages/areaMonitor/components/VideoListRight.vue
@@ -106,6 +106,7 @@
 </template>
   <script>
 import bus from "@/views/layout/bus";
+import moment from 'moment'
 
 import * as echarts from "echarts";
 export default {
@@ -135,20 +136,39 @@ export default {
         advice: "",
         area: "台东商圈",
       },
+      lastWeek:[],  //最近一周。
+      
     };
   },
   components: {
   },
   created() {},
   mounted() {
+    this.setDataRange();
     //获取高发区域
     this.getTop5Area();
     //获取高发事件
     this.getTop5EventCharts();
     //获取相关性分析
-    this.getRelevanceCharts();
+    // this.getRelevanceCharts();
   },
   methods: {
+      // 设置daterange 日期
+      // daterange: ['2022-11-18','2022-11-25'],
+    setDataRange(){
+      this.daterange=[];
+      let nowData=moment().format("YYYY-MM-DD");
+      let sevenData=moment().subtract(6, 'days').format('YYYY-MM-DD');
+      this.daterange.push(sevenData);
+      this.daterange.push(nowData);
+      for (let i=6; i>=0; i--){
+        let newData=moment().subtract(i, 'days').format('MM-DD');
+        this.lastWeek.push(newData);
+        // console.log("🚀 ~ file: VideoListRight.vue:168 ~ setDataRange ~ this.lastWeek", this.lastWeek)
+      }
+       //获取相关性分析
+      this.getRelevanceCharts(this.lastWeek);
+    },
     //选择选中的高发区域
     chooseSelectArea(item) {
       this.selectArea = item.areaId;
@@ -287,7 +307,7 @@ export default {
       eventChart.setOption(option);
     },
     //获取相关性分析
-    getRelevanceCharts() {
+    getRelevanceCharts(date) {
       let eventChart = echarts.init(document.getElementById("relevance-chart"));
       let option = {
         backgroundColor: "rgba(32, 33, 36,.7)",
@@ -317,7 +337,7 @@ export default {
         },
         xAxis: {
           type: "category",
-          data: ["11/18", "11/19", "11/20", "11/21", "11/22", "11/23", "11/24"],
+          data: date,
           axisLine: {
             show: false, // 不显示坐标轴线
             lineStyle: {
diff --git a/src/views/pages/areaMonitor/index.vue b/src/views/pages/areaMonitor/index.vue
index 5b8d9c4..4ec4068 100644
--- a/src/views/pages/areaMonitor/index.vue
+++ b/src/views/pages/areaMonitor/index.vue
@@ -66,7 +66,7 @@
       </div> 
       <!-- 工地列表 -->
       <div class="siteList" v-if="keyAreasShow">
-        <site-list-more></site-list-more>
+        <site-list-more @closeSiteListMore="closeSiteListMore"></site-list-more>
       </div>
 
           <!--视频列表弹出框-->
@@ -279,8 +279,12 @@ export default {
     }
   },
   methods: {
+    // 关闭重点区域。
+    closeSiteListMore(){
+      this.keyAreasShow=false;
+    },
     IsShowLideoVisible(val){
- this.videoVisible=val
+      this.videoVisible=val
     },
     // 获取年月日
     getCurrentTime() {
@@ -482,7 +486,7 @@ export default {
     },
 
     layerHandleChange(item) {
-      console.log("地图显示等",item);
+      console.log("地图显示等111",item);
       if (this.changeLayerBtnGroup.indexOf(item) !== -1) {
         switch (item) {
           case "AI事件":
@@ -709,7 +713,7 @@ export default {
         case "clear":
           this.hiMapFun.removeLayerByLayerName("types");
           this.hiMapFun.removeLayerByLayerName("thermodynamic");
-          this.thermodynamicPeopleType = "";
+          // this.thermodynamicPeopleType = "";
           break;  
       }
     },
@@ -726,6 +730,11 @@ export default {
       this.hiMapFun.removeLayerByLayerName("景区景点");
       this.hiMapFun.removeLayerByLayerName("海水浴场");
       this.hiMapFun.removeLayerByLayerName("窗口单位");
+      //清除地图底部的、地图显示、重点区域、人流热力
+      this.changeLayerBtnGroup=[];
+      this.thermodynamicPeopleType = "";
+
+      
     },
     //点击是否显示重点区域。
     handleKeyArea() {

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 3/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E7=B2=BE=E7=BB=86=E5=8C=96=E7=AE=A1=E7=90=86-=E5=95=86?=
 =?UTF-8?q?=E4=B8=9A=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 = "";