大佛寺社区合并至锦祥园社区，地图右侧加网格列表

public/json/community-geo.json

@@ -4552,8 +4552,8 @@
       "type": "Feature",
       "properties": {
         "id": "1326111149745274881",
-        "communityId": "",
+        "communityId": "111111111111111d",
-        "title": "大佛寺村",
+        "title": "锦祥园社区",
         "center": [
           116.425272,
           36.263102
@@ -4842,7 +4842,7 @@
       "properties": {
         "id": "1252828788241235970",
         "communityId": "111111111111111d",
-        "title": "锦祥园社区",
+        "title": "",
         "center": [
           116.425551,
           36.27009

public/json/grid-geo.json

@@ -1589,7 +1589,7 @@
       "gridId": "",
       "parentId": "1326111149745274881",
       "productId": "1534134336596434946",
-      "title": "大佛寺村第一网格",
+      "title": "锦祥园社区第一网格",
       "center": {
         "lng": 116.425272,
         "lat": 36.263102

src/router/index.js

@@ -29,5 +29,4 @@ const routes = [
 const router = new Router({
   routes
 })
-console.log(router);
 export default router

src/style/font.scss

@@ -1,27 +1,27 @@
-// @font-face {
+@font-face {
-//   font-family: 'PingFang Regular';
+  font-family: 'PingFang Regular';
-//   src: url('../assets/fonts/PingFang-regular.ttf') format('truetype');
+  src: url('../assets/fonts/PingFang-regular.ttf') format('truetype');
-//   font-weight: normal;
+  font-weight: normal;
-//   font-style: normal;
+  font-style: normal;
-// }
+}
 
-// @font-face {
+@font-face {
-//   font-family: 'PingFang Simple Thin';
+  font-family: 'PingFang Simple Thin';
-//   src: url('../assets/fonts/pingfang-simple-thin.ttf') format('truetype');
+  src: url('../assets/fonts/pingfang-simple-thin.ttf') format('truetype');
-//   font-weight: normal;
+  font-weight: normal;
-//   font-style: normal;
+  font-style: normal;
-// }
+}
 
-// @font-face {
+@font-face {
-//   font-family: 'PingFang Simple Bold';
+  font-family: 'PingFang Simple Bold';
-//   src: url('../assets/fonts/pingfang-simple-bold.ttf') format('truetype');
+  src: url('../assets/fonts/pingfang-simple-bold.ttf') format('truetype');
-//   font-weight: normal;
+  font-weight: normal;
-//   font-style: normal;
+  font-style: normal;
-// }
+}
 
-// @font-face {
+@font-face {
-//   font-family: 'FZZhengHeiS-B-GB';
+  font-family: 'FZZhengHeiS-B-GB';
-//   src: url('../assets/fonts/fzzhengheis-el-gb.ttf') format('truetype');
+  src: url('../assets/fonts/fzzhengheis-el-gb.ttf') format('truetype');
-//   font-weight: bolder;
+  font-weight: bolder;
-//   font-style: normal;
+  font-style: normal;
-// }
+}

src/views/next/screen-content-map/index.vue

@@ -23,22 +23,22 @@
       </div>
 
       <div class="map-bottom-decoration"></div>
-      <!-- <div class="map-tab-list">
+      <div class="map-tab-list" v-if="mapLevel == 'grid' &&mapTabList.length!=0">
       <div
-        :class="['tab-item', currentTab === item.label ? 'active' : '']"
+        :class="['tab-item']"
         v-for="(item, index) in mapTabList"
         :key="index"
         @click="chooseTab(item)"
       >
-        <div class="icon">
+        <!-- <div class="icon">
           <img
             :src="currentTab === item.label ? item.selectIcon : item.icon"
             alt="图标"
           />
-        </div>
+        </div> -->
-        <div class="label">{{ item.label }}</div>
+       {{ item.label }}
       </div>
-    </div> -->
+    </div>
 
       <div :class="['map-serch', collapse ? 'collapse' : '']" @click.stop="collapse = false">
         <el-select v-model="searchSelect">
@@ -126,7 +126,10 @@ export default {
       ],
       mapTabList: [
         // { icon: require('@/assets/images/red-cross-blue-icon.png'), label: '红十字会', selectIcon: require('@/assets/images/red-cross-yellow-icon.png') },
-        { icon: require('@/assets/images/volunteer-blue-icon.png'), label: '志愿者', selectIcon: require('@/assets/images/volunteer-yellow-icon.png') }
+        // {  label: '第一网格' },
+        // {  label: '第二网格' },
+        // {  label: '第三网格' },
+        // {  label: '第四网格' }
       ],
       currentTab: '',
       searchOptionList: [
@@ -189,6 +192,8 @@ export default {
     handelCLickBack() {
       this.mapBack = false
       this.initMap()
+      this.set_mapLevel('community')
+      this.set_communityId('111111111111111c')
     },
     initMap() {
       this.getMapStatistics()
@@ -216,6 +221,7 @@ export default {
     },
     // 获取顶部统计数
     getMapStatistics() {
+     
       if (this.mapLevel === 'community' || (this.mapLevel === 'grid' && !this.communityId)) {
         const params = {
           id: this.streetId
@@ -598,27 +604,29 @@ img {
 
   .map-tab-list {
     position: absolute;
-    left: calc(560px + 10px + 32px);
+    right: calc(560px + 10px + 32px);
-    bottom: 60px;
+    bottom: 50%;
     z-index: 20;
-
+    color: #fff;
     .tab-item {
       width: 115px;
       height: 36px;
       background: rgba(8, 31, 57, 0.61);
-      border: 1px solid #12d0ff;
       border-radius: 2px;
       display: flex;
       align-items: center;
       box-sizing: border-box;
-      padding-left: 13px;
+      // padding-left: 13px;
       cursor: pointer;
-
+      justify-content:center;
-      .icon {
+      // .icon {
-        width: 20px;
+      //   width: 20px;
-        height: 20px;
+      //   height: 20px;
+      // }
+      &:hover {
+           color: #60d6e8 !important;
+           background: linear-gradient(to left, rgba(255, 255, 255, 0), #073277, rgba(255, 255, 255, 0));
       }
-
       .label {
         font-size: 16px;
         font-family: "PingFang Regular";
@@ -631,9 +639,9 @@ img {
         margin-left: 6px;
       }
 
-      &+.tab-item {
+      // &+.tab-item {
-        margin-top: 6px;
+      //   margin-top: 6px;
-      }
+      // }
 
       &.active {
         background: rgba(8, 31, 57, 0.61);