diff --git a/public/json/community-geo.json b/public/json/community-geo.json index 80cb043..6c74705 100644 --- a/public/json/community-geo.json +++ b/public/json/community-geo.json @@ -4552,8 +4552,8 @@ "type": "Feature", "properties": { "id": "1326111149745274881", - "communityId": "", - "title": "大佛寺村", + "communityId": "111111111111111d", + "title": "锦祥园社区", "center": [ 116.425272, 36.263102 @@ -4842,7 +4842,7 @@ "properties": { "id": "1252828788241235970", "communityId": "111111111111111d", - "title": "锦祥园社区", + "title": "", "center": [ 116.425551, 36.27009 diff --git a/public/json/grid-geo.json b/public/json/grid-geo.json index 162719f..03b50ef 100644 --- a/public/json/grid-geo.json +++ b/public/json/grid-geo.json @@ -1589,7 +1589,7 @@ "gridId": "", "parentId": "1326111149745274881", "productId": "1534134336596434946", - "title": "大佛寺村第一网格", + "title": "锦祥园社区第一网格", "center": { "lng": 116.425272, "lat": 36.263102 diff --git a/src/router/index.js b/src/router/index.js index 381d366..49258da 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,5 +29,4 @@ const routes = [ const router = new Router({ routes }) -console.log(router); export default router diff --git a/src/style/font.scss b/src/style/font.scss index 3d42ef0..0509180 100644 --- a/src/style/font.scss +++ b/src/style/font.scss @@ -1,27 +1,27 @@ -// @font-face { -// font-family: 'PingFang Regular'; -// src: url('../assets/fonts/PingFang-regular.ttf') format('truetype'); -// font-weight: normal; -// font-style: normal; -// } +@font-face { + font-family: 'PingFang Regular'; + src: url('../assets/fonts/PingFang-regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} -// @font-face { -// font-family: 'PingFang Simple Thin'; -// src: url('../assets/fonts/pingfang-simple-thin.ttf') format('truetype'); -// font-weight: normal; -// font-style: normal; -// } +@font-face { + font-family: 'PingFang Simple Thin'; + src: url('../assets/fonts/pingfang-simple-thin.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} -// @font-face { -// font-family: 'PingFang Simple Bold'; -// src: url('../assets/fonts/pingfang-simple-bold.ttf') format('truetype'); -// font-weight: normal; -// font-style: normal; -// } +@font-face { + font-family: 'PingFang Simple Bold'; + src: url('../assets/fonts/pingfang-simple-bold.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} -// @font-face { -// font-family: 'FZZhengHeiS-B-GB'; -// src: url('../assets/fonts/fzzhengheis-el-gb.ttf') format('truetype'); -// font-weight: bolder; -// font-style: normal; -// } \ No newline at end of file +@font-face { + font-family: 'FZZhengHeiS-B-GB'; + src: url('../assets/fonts/fzzhengheis-el-gb.ttf') format('truetype'); + font-weight: bolder; + font-style: normal; +} \ No newline at end of file diff --git a/src/views/next/screen-content-map/index.vue b/src/views/next/screen-content-map/index.vue index b706353..76072d5 100644 --- a/src/views/next/screen-content-map/index.vue +++ b/src/views/next/screen-content-map/index.vue @@ -23,22 +23,22 @@
- + {{ item.label }} - --> +