diff --git a/packages/bigscreen/dv/AppMonitorMapDv.vue b/packages/bigscreen/dv/AppMonitorMapDv.vue
index 668b3787..c9b56fb0 100644
--- a/packages/bigscreen/dv/AppMonitorMapDv.vue
+++ b/packages/bigscreen/dv/AppMonitorMapDv.vue
@@ -247,11 +247,6 @@ export default {
})
},
- changeZoom(isAdd) {
- const zoom = isAdd ? this.map.getZoom() + 1 : this.map.getZoom() - 1
- this.map.setZoom(zoom, false, 600)
- },
-
formatName (str) {
if (!str) return ''
diff --git a/packages/bigscreen/dv/AppResourceMapDv.vue b/packages/bigscreen/dv/AppResourceMapDv.vue
index 99554e92..7f279f52 100644
--- a/packages/bigscreen/dv/AppResourceMapDv.vue
+++ b/packages/bigscreen/dv/AppResourceMapDv.vue
@@ -83,11 +83,6 @@ export default {
})
},
- changeZoom(isAdd) {
- const zoom = isAdd ? this.map.getZoom() + 1 : this.map.getZoom() - 1
- this.map.setZoom(zoom, false, 600)
- },
-
getInfo (id) {
this.instance.post(`/app/appresourceinfo/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) {
@@ -97,10 +92,6 @@ export default {
})
},
- toCenter() {
- this.map.setZoomAndCenter(this.zoom, this.center, false, 600)
- },
-
renderClusterMarker(context) {
let el = `
@@ -119,10 +110,9 @@ export default {
},
renderMarker(context) {
- console.log(context)
const buildId = context.data[0].id
- let el = `
+ let el = `
`
@@ -139,8 +129,7 @@ export default {
document.querySelectorAll('.mark').forEach(el => {
el.classList.remove('mark-active')
})
- document.querySelector(`#buildId-${e.target.id}`).add('mark-active')
- this.map.setZoomAndCenter(this.map.getZoom() + 0.000000001, e.target.lnglat, false, 300)
+ document.querySelector(`#buildId-${e.target.id}`).classList.add('mark-active')
})
},
@@ -469,6 +458,7 @@ export default {
}
::v-deep .mark{
+ position: relative;
user-select: none;
width: 50px;
height: 50px;
@@ -484,6 +474,10 @@ export default {
&:hover {
opacity: 0.8;
}
+
+ &.mark-active {
+ transform: scale(1.2);
+ }
}
@-webkit-keyframes warn {
diff --git a/project/pingchang/apps/AppHomeReport/components/List.vue b/project/pingchang/apps/AppHomeReport/components/List.vue
index 505e4783..ca6c493a 100644
--- a/project/pingchang/apps/AppHomeReport/components/List.vue
+++ b/project/pingchang/apps/AppHomeReport/components/List.vue
@@ -28,17 +28,17 @@
this.dict.getLabel('EP_riskStatus', v) },
{
- prop: 'riskLevel',
+ prop: 'riskStatus',
align: 'center',
label: '风险状态',
- formart: v => this.dict.getLabel('EP_riskLevel', v)
+ formart: v => this.dict.getLabel('EP_riskStatus', v)
}
],
ids: [],
@@ -163,7 +168,7 @@
if (res.code == 0) {
this.search.arriveAreaId = res.data
this.getTotalInfo()
- this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType']).then(() => {
+ this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
this.getList()
})
}