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}} -