From 1cd04c95fca047ae467dc05da20222e6b194b3d0 Mon Sep 17 00:00:00 2001
From: gounaikang <gounaikang@hisense.com>
Date: Mon, 29 Aug 2022 17:54:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../area/components/ImportantAreaPop.vue      |  4 ++++
 .../area/components/StatisticalAnalysis.vue   | 12 +++++++++-
 src/views/pages/area/index.vue                | 22 +++++++++++++------
 .../components/ComplaintEvent.vue             |  2 +-
 .../construction/components/SiteListPop.vue   |  5 +++--
 .../components/StatisticalAnalysis.vue        |  9 +++++++-
 src/views/pages/construction/index.vue        |  3 ++-
 7 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/views/pages/area/components/ImportantAreaPop.vue b/src/views/pages/area/components/ImportantAreaPop.vue
index da5ea70..df87287 100644
--- a/src/views/pages/area/components/ImportantAreaPop.vue
+++ b/src/views/pages/area/components/ImportantAreaPop.vue
@@ -193,6 +193,9 @@ export default {
         grid: {
           bottom: 34,
         },
+        tooltip: {
+          trigger: 'axis'
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
@@ -213,6 +216,7 @@ export default {
         yAxis: [
           {
             type: 'value',
+            minInterval : 1,
             name: '人',
             nameTextStyle: {
               color: 'rgba(255, 255, 255,.8)'
diff --git a/src/views/pages/area/components/StatisticalAnalysis.vue b/src/views/pages/area/components/StatisticalAnalysis.vue
index 17470af..2250336 100644
--- a/src/views/pages/area/components/StatisticalAnalysis.vue
+++ b/src/views/pages/area/components/StatisticalAnalysis.vue
@@ -276,7 +276,7 @@ import { selectMonthAreaEvent, selectByAreaEvent, selectEventType } from "@/api/
           },
           { 
             text: "事件处置率",
-            subtext: '     65%',
+            subtext: '     50%',
             left: 35,
             top: 'center',
             textStyle: {
@@ -327,6 +327,9 @@ import { selectMonthAreaEvent, selectByAreaEvent, selectEventType } from "@/api/
             return '{name|' + name + " " + " " + '}{value|' + tarValue + '件' + " " + " " + p + "%" + '}'
           },
         },
+        tooltip: {
+          trigger: 'item'
+        },
         series: [
           {
             type: 'pie',
@@ -411,6 +414,9 @@ import { selectMonthAreaEvent, selectByAreaEvent, selectEventType } from "@/api/
           top: 80,
           bottom: 34,
         },
+        tooltip: {
+          trigger: "axis"
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
@@ -431,6 +437,7 @@ import { selectMonthAreaEvent, selectByAreaEvent, selectEventType } from "@/api/
         yAxis: {
           type: 'value',
           name: '数量',
+          minInterval : 1,
           nameTextStyle: {
             color: 'rgba(255, 255, 255.0.8)'
           },
@@ -505,6 +512,9 @@ import { selectMonthAreaEvent, selectByAreaEvent, selectEventType } from "@/api/
           top: 80,
           bottom: 34,
         },
+        tooltip: {
+          trigger: "axis"
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
diff --git a/src/views/pages/area/index.vue b/src/views/pages/area/index.vue
index 54969a5..66807f8 100644
--- a/src/views/pages/area/index.vue
+++ b/src/views/pages/area/index.vue
@@ -326,15 +326,22 @@ export default {
         {
           latLng: { lat: arr[1], lng: arr[0] },
           data: item,
+          type: "site",
         },
       ];
+      this.hiMapFun.removeLayerByLayerName("roadPoint");
       this.hiMap.mapObj.map.flyTo({ lat: arr[1], lng: arr[0] });
-      this.hiMapFun.openPopupVideoSurveillance(searchDataDetail[0]);
-      this.hiMapFun.addResourceOnMapWithoutSuperMapCluster(
+      this.hiMapFun.addPointsToMap(
         searchDataDetail,
         "poi-red.png",
-        "address"
+        "roadPoint"
       );
+      // this.hiMapFun.openPopupVideoSurveillance(searchDataDetail[0]);
+      // this.hiMapFun.addResourceOnMapWithoutSuperMapCluster(
+      //   searchDataDetail,
+      //   "poi-red.png",
+      //   "address"
+      // );
       // this.timer = setTimeout(() => {
       //   this.addResourceTomap("全部", this.cameraAllData);
       // }, 1000);
@@ -641,6 +648,7 @@ export default {
   width: 100%;
   height: 100%;
   position: absolute;
+  z-index: -1;
   .normal-map-content {
     width: 100%;
     height: 100%;
@@ -770,7 +778,7 @@ export default {
 
   .siteList {
     position: absolute;
-    z-index: 1000;
+    z-index: 10;
     right: 8px;
     top: 562px;
     width: 398px;
@@ -782,7 +790,7 @@ export default {
     left: 50%;
     transform: translateX(-50%);
     bottom: 120px;
-    z-index: 1005;
+    z-index: 10;
     width: 555px;
     height: 80px;
     background: url("~@/assets/civilizedCity/legend.png") no-repeat;
@@ -793,7 +801,7 @@ export default {
     left: 50%;
     transform: translateX(-50%);
     bottom: 220px;
-    z-index: 1000;
+    z-index: 10;
     span {
       position: absolute;
       right: 42px;
@@ -811,7 +819,7 @@ export default {
     left: 50%;
     transform: translateX(-50%);
     display: flex;
-    z-index: 1000;
+    z-index: 10;
     .title {
       width: 96px;
       height: 100%;
diff --git a/src/views/pages/construction/components/ComplaintEvent.vue b/src/views/pages/construction/components/ComplaintEvent.vue
index 32b7545..ae1d725 100644
--- a/src/views/pages/construction/components/ComplaintEvent.vue
+++ b/src/views/pages/construction/components/ComplaintEvent.vue
@@ -33,7 +33,7 @@
                 @click="typeSelect(item)"
                 >{{item}}</div>
         </div>
-        <div class="filter-btn-processStateSelect">
+        <div v-if="false" class="filter-btn-processStateSelect">
           <div  class="processStateSelect-btn" 
                 v-for="item in filterButton.processStateSelect" 
                 :key="item"
diff --git a/src/views/pages/construction/components/SiteListPop.vue b/src/views/pages/construction/components/SiteListPop.vue
index 7836166..79e8264 100644
--- a/src/views/pages/construction/components/SiteListPop.vue
+++ b/src/views/pages/construction/components/SiteListPop.vue
@@ -182,6 +182,7 @@ export default {
         yAxis: [
           {
             type: 'value',
+            minInterval : 1,
             name: 'dB',
             nameTextStyle: {
               color: 'rgba(255, 255, 255,.8)'
@@ -312,14 +313,14 @@ export default {
 // }
   .site-popup {
     a.leaflet-popup-close-button {
-      top:120px;
+      top:150px;
     }
     .leaflet-popup-content-wrapper {
       box-shadow: 0 0 10px  rgba($color: #1ffefd, $alpha: .4);
       background: rgba(24,51,76,.95);
       border: 1px solid rgba(50,227,235,.95);
       position: relative;
-      top: 120px;
+      top: 150px;
     }
     .leaflet-popup-content {
       width: 734px !important;
diff --git a/src/views/pages/construction/components/StatisticalAnalysis.vue b/src/views/pages/construction/components/StatisticalAnalysis.vue
index a8b6ac1..a8abc50 100644
--- a/src/views/pages/construction/components/StatisticalAnalysis.vue
+++ b/src/views/pages/construction/components/StatisticalAnalysis.vue
@@ -349,7 +349,7 @@ import * as echarts from 'echarts'
           },
           { 
             text: "事件处置率",
-            subtext: '     65%',
+            subtext: '     50%',
             left: 35,
             top: 'center',
             textStyle: {
@@ -400,6 +400,9 @@ import * as echarts from 'echarts'
             return '{name|' + name + " " + " " + '}{value|' + tarValue + '件' + " " + " " + p + "%" + '}'
           },
         },
+        tooltip: {
+          trigger: 'item'
+        },
         series: [
           {
             type: 'pie',
@@ -484,6 +487,9 @@ import * as echarts from 'echarts'
           top: 80,
           bottom: 34,
         },
+        tooltip: {
+          trigger: "axis"
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
@@ -504,6 +510,7 @@ import * as echarts from 'echarts'
         yAxis: {
           type: 'value',
           name: '数量',
+          minInterval : 1,
           nameTextStyle: {
             color: 'rgba(255, 255, 255.0.8)'
           },
diff --git a/src/views/pages/construction/index.vue b/src/views/pages/construction/index.vue
index 52a4c93..a4549d5 100644
--- a/src/views/pages/construction/index.vue
+++ b/src/views/pages/construction/index.vue
@@ -417,6 +417,7 @@ export default {
   width: 100%;
   height: 100%;
   position: absolute;
+  z-index: -1;
   .normal-map-content {
     width: 100%;
     height: 100%;
@@ -563,7 +564,7 @@ export default {
     left: 50%;
     transform: translateX(-50%);
     display: flex;
-    z-index: 1000;
+    z-index: 10;
     .title {
       width: 96px;
       height: 100%;