Merge remote-tracking branch 'origin/jw_feature_zhanlibiao' into jw_feature_dev

src/views/dataBoard/cpts/map/index.vue

@@ -1040,12 +1040,12 @@ export default {
     display: none;
   }
 
-  /deep/ .jw-popup-bg {
+/*  /deep/ .jw-popup-bg {
     background: url('@/assets/images/overview/map-pop-img.png') no-repeat;
     width: 80px;
     height: 80px;
     margin-right: 10px;
-  }
+  }*/
 
   /deep/ .jw-popup-container {
     display: flex;

src/views/dataBoard/satisfactionEval/potentialPeople/index.vue

@@ -111,14 +111,8 @@ export default {
       list: [],
     };
   },
-  watch: {
+
-    "$route.query.countType" () {
+  activated() {
-      if(this.$route.path === '/dataBoard/satisfactionEval/potentialPeople') {
-        this.getList();
-      }
-    }
-  },
-  mounted() {
     this.getOrg();
   },
   methods: {
@@ -149,6 +143,7 @@ export default {
     },
     getList() {
       this.loading = true
+      console.log(this.$route.query.countType)
       let params = {
         ...this.queryParams,
         countType: this.$route.query.countType