From 08c8fe036622bdb67b0cf405a46a95554ef50ca1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 11 Oct 2022 09:22:33 +0800
Subject: [PATCH] bug

---
 packages/bigscreen/dv/AppMonitorMapDv.vue     |  5 ----
 packages/bigscreen/dv/AppResourceMapDv.vue    | 20 ++++++----------
 .../apps/AppHomeReport/components/List.vue    | 23 +++++++++++--------
 3 files changed, 21 insertions(+), 27 deletions(-)

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 = `<div class="polymeric">
         <div class="polymeric-container">
@@ -119,10 +110,9 @@ export default {
     },
 
     renderMarker(context) {
-      console.log(context)
       const buildId = context.data[0].id
 
-      let el = `<div class="mark" id="buildId-${buildId}">
+      let el = `<div id="buildId-${buildId}" class="mark ${buildId === this.choosedId ? 'mark-active' : ''}">
          <img src="${context.data[0].categoryIcon || 'https://cdn.cunwuyun.cn/dvcp/ply/icon.png'}">
       </div>`
 
@@ -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 @@
         <ai-search-bar bottomBorder>
           <template #left>
             <ai-select
-              v-model="search.gatewayId"
+              v-model="search.riskStatus"
               clearable
               placeholder="请选择风险状态"
-              :selectList="dict.getDict('EP_registerInfoType')"
+              :selectList="dict.getDict('EP_riskStatus')"
               @change="search.current = 1, getList()">
             </ai-select>
             <ai-select
-              v-model="search.gatewayId"
+              v-model="search.source"
               clearable
               placeholder="请选择数据来源"
-              :selectList="dict.getDict('EP_registerInfoType')"
+              :selectList="dict.getDict('EP_source')"
               @change="search.current = 1, getList()">
             </ai-select>
             <el-date-picker
@@ -114,10 +114,12 @@
           name: '',
           gatewayId: '',
           status: '',
+          riskStatus: '',
           arriveAreaId: '',
           queryBeginTime: '',
           queryEndTime: '',
-          infoType: 1
+          infoType: 1,
+          source: ''
         },
         info: {},
         colConfigs: [
@@ -135,12 +137,15 @@
             align: 'center',
             label: '到达地区'
           },
-          { prop: 'companionCount', align: 'center', label: '数据来源' },
+          { prop: 'source',
+            align: 'center',
+            label: '数据来源',
+            formart: v => 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()
           })
         }