From 4050e578175a040dd54c94d3e1d1a08374c2c505 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 Jan 2024 16:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BD=9B=E5=AF=BA=E7=A4=BE=E5=8C=BA?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E8=87=B3=E9=94=A6=E7=A5=A5=E5=9B=AD=E7=A4=BE?=
=?UTF-8?q?=E5=8C=BA=EF=BC=8C=E5=9C=B0=E5=9B=BE=E5=8F=B3=E4=BE=A7=E5=8A=A0?=
=?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/json/community-geo.json | 6 +--
public/json/grid-geo.json | 2 +-
src/router/index.js | 1 -
src/style/font.scss | 48 ++++++++++-----------
src/views/next/screen-content-map/index.vue | 48 ++++++++++++---------
5 files changed, 56 insertions(+), 49 deletions(-)
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 }}
- -->
+
@@ -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);
- bottom: 60px;
+ right: calc(560px + 10px + 32px);
+ 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;
-
- .icon {
- width: 20px;
- height: 20px;
+ justify-content:center;
+ // .icon {
+ // width: 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 {
- margin-top: 6px;
- }
+ // &+.tab-item {
+ // margin-top: 6px;
+ // }
&.active {
background: rgba(8, 31, 57, 0.61);