From e84e336d3a026b02e397883569fd8a06f1fea434 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 15 Jun 2022 15:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=95=9C=E5=83=8F?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=A4=B4=E9=83=A8=E8=B7=AF=E7=94=B1=20=20?=
=?UTF-8?q?=20=E7=BA=BF=E5=A4=B4=E5=8F=8C=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/assets/home/box_bg2.png | Bin 0 -> 1972 bytes
front/src/assets/home/zx2.png | Bin 0 -> 1569 bytes
front/src/views/home/components/header.vue | 8 +++-
front/src/views/home/mapTest/index.vue | 51 +++++++++++++++++++--
4 files changed, 55 insertions(+), 4 deletions(-)
create mode 100644 front/src/assets/home/box_bg2.png
create mode 100644 front/src/assets/home/zx2.png
diff --git a/front/src/assets/home/box_bg2.png b/front/src/assets/home/box_bg2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba2d788ad1a48e3a99145384dfe41abee7405b81
GIT binary patch
literal 1972
zcmb7FYd9NN8a~RnwNX<~J9UZs)S!&oY7F95lp5MW2}UT>s;!_jNDvm&>Y~av3`!_v
zNQi1hk%TIuRg@s=T4P(A1PPK*K__
sX@8i2G606u<_
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
T?8OYu00000NkvXXu0mjfb!O3o
literal 0
HcmV?d00001
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 9aedcaff..5365de8b 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -104,6 +104,7 @@
{ name: '开发指南', key: 'developmentGuide' },
{ name: '需求中心', key: 'demandCenter' },
{ name: '个人中心', key: 'personalCenter' },
+ { name: '区市站点', key: 'mapTest' },
{ name: '后台管理', key: 'houtaiguanli' },
{ name: '赋能案例', key: 'assignCase' },
])
@@ -164,6 +165,11 @@
path: '/demandCenter',
})
break
+ case '区市站点':
+ router.push({
+ path: '/mapTest',
+ })
+ break
case '后台管理':
window.open(window.SITE_CONFIG.backUrl + '/#/bscatalogue-bscatalogue')
window.reload('http://15.2.21.238:9797')
@@ -264,7 +270,7 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 0 1.9rem;
+ padding: 0 1rem;
background-color: rgba(0, 0, 25, 0.7);
position: fixed;
z-index: 1000;
diff --git a/front/src/views/home/mapTest/index.vue b/front/src/views/home/mapTest/index.vue
index 3cdb204a..8099ebcb 100644
--- a/front/src/views/home/mapTest/index.vue
+++ b/front/src/views/home/mapTest/index.vue
@@ -331,6 +331,26 @@
}
return res
}
+ const convertData2 = function (data) {
+ let res = []
+ for (let i = 0; i < data.length; i++) {
+ let dataItem = data[i]
+ let fromCoord = [120.364482, 36.065671]
+ let toCoord = geoCoordMap[dataItem.name]
+ if (fromCoord && toCoord) {
+ res.push([
+ {
+ coord: fromCoord,
+ value: dataItem.value,
+ },
+ {
+ coord: toCoord,
+ },
+ ])
+ }
+ }
+ return res
+ }
;[['市南区', areaMenuList.value]].forEach(function (item) {
option.series.push(
{
@@ -352,6 +372,25 @@
},
data: convertData(item[1]),
},
+ {
+ type: 'lines',
+ zlevel: 2,
+ effect: {
+ show: true,
+ period: 4, //箭头指向速度,值越小速度越快
+ trailLength: 0.02, //特效尾迹长度[0,1]值越大,尾迹越长重
+ symbol: 'arrow', //箭头图标
+ symbolSize: 5, //图标大小
+ },
+ lineStyle: {
+ normal: {
+ width: 1, //尾迹线条宽度
+ opacity: 1, //尾迹线条透明度
+ curveness: -0.3, //尾迹线条曲直度
+ },
+ },
+ data: convertData2(item[1]),
+ },
{
type: 'effectScatter',
coordinateSystem: 'geo',
@@ -427,7 +466,7 @@
symbolOffset: [0, -25],
data: [
{
- name: item[0],
+ name: '',
value: geoCoordMap[item[0]].concat([10]),
},
],
@@ -608,12 +647,18 @@
background-size: 100%;
position: relative;
top: -0.9rem;
- left: -1.88rem;
+ left: -1.84rem;
}
}
.xha {
top: 5.45rem;
- left: 9.6rem;
+ left: 3.5rem;
+ background: url('~@/assets/home/box_bg2.png') no-repeat;
+ .zx {
+ background: url('~@/assets/home/zx2.png') no-repeat;
+ top: -0.9rem;
+ left: 2.82rem;
+ }
}
.lsq {
top: 3.7rem;