From d18d4845e7ed3e4538e127ba75dba9623328572f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 11:56:37 +0800
Subject: [PATCH] 部分更改
---
src/components/map/components/campusBuildingSearch.vue | 81 ++++++++++++++++++++--------------------
src/pcLayout/index.vue | 16 ++++----
src/styles/entitys/text-entitys.scss | 5 ++
src/components/leftNav/index.vue | 17 ++++----
4 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index 3d2d91d..bea4230 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -62,14 +62,14 @@
// checked: '/img/leftnav/activity-checked.png',
// layer: 'activityLayer'
// },
- {
- flag: false,
- label: 'AED',
- img: '/img/leftnav/aed.png',
- normal: '/img/leftnav/aed.png',
- checked: '/img/leftnav/aed-checked.png',
- layer: 'aedLayer'
- },
+ // {
+ // flag: false,
+ // label: 'AED',
+ // img: '/img/leftnav/aed.png',
+ // normal: '/img/leftnav/aed.png',
+ // checked: '/img/leftnav/aed-checked.png',
+ // layer: 'aedLayer'
+ // },
{
flag: false,
label: '停车',
@@ -159,6 +159,7 @@
</div>
`
)
+
this.tagLayer.addOverlay(divIcon)
})
this.tagLayer.show = false
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 2129ee6..ee1ebdf 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -58,48 +58,48 @@
return {
DC: null,
shortcutList: [
- {
- bgimg: '/img/search/org.png',
- title: '党群机构',
- type: 'orgnav',
- path: '/pcLayout/default/orgnav/masses',
- code: 1
- },
- {
- bgimg: '/img/search/ofc.png',
- title: '职能部处',
- type: 'orgnav',
- path: '/pcLayout/default/orgnav/ofc',
- code: 2
- },
- {
- bgimg: '/img/search/teach.png',
- title: '教学科研',
- type: 'arc',
- path: '/pcLayout/default/arc/teaching',
- code: 2
- },
+ // {
+ // bgimg: '/img/search/org.png',
+ // title: '党群机构',
+ // type: 'orgnav',
+ // path: '/pcLayout/default/orgnav/masses',
+ // code: 1
+ // },
+ // {
+ // bgimg: '/img/search/ofc.png',
+ // title: '职能部处',
+ // type: 'orgnav',
+ // path: '/pcLayout/default/orgnav/ofc',
+ // code: 2
+ // },
+ // {
+ // bgimg: '/img/search/teach.png',
+ // title: '教学科研',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/teaching',
+ // code: 2
+ // },
{
bgimg: '/img/search/venue.png',
title: '社区场馆',
type: 'arc',
path: '/pcLayout/default/arc/venue',
code: 3
- },
- {
- bgimg: '/img/search/dorm.png',
- title: '社区宿舍',
- type: 'arc',
- path: '/pcLayout/default/arc/dorm',
- code: 4
- },
- {
- bgimg: '/img/search/scenery.png',
- title: '文化风景',
- type: 'arc',
- path: '/pcLayout/default/arc/culture',
- code: 5
}
+ // {
+ // bgimg: '/img/search/dorm.png',
+ // title: '社区宿舍',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/dorm',
+ // code: 4
+ // },
+ // {
+ // bgimg: '/img/search/scenery.png',
+ // title: '文化风景',
+ // type: 'arc',
+ // path: '/pcLayout/default/arc/culture',
+ // code: 5
+ // }
],
shortcutFlag: false,
searchInput: '',
@@ -299,7 +299,7 @@
right: 0;
bottom: auto;
margin: auto;
- width: 320px;
+ width: 330px;
min-height: 40px;
max-height: 360px;
height: auto;
@@ -309,7 +309,7 @@
.search-input {
float: left;
- width: 240px;
+ width: 250px;
height: 40px;
border-radius: 5px 0 0 5px;
@@ -359,7 +359,7 @@
top: 41px;
left: 0;
width: auto;
- min-width: 240px;
+ min-width: 250px;
max-height: 520px;
background: #fff;
overflow-y: auto;
@@ -383,7 +383,7 @@
.map-campus-shortcut {
margin-top: 20px;
width: 100%;
- height: 320px;
+ height: 330px;
background: #fff;
border-radius: 5px;
@@ -393,10 +393,11 @@
display: flex;
width: 100%;
height: 120px;
- justify-content: space-around;
+ justify-content: start;
flex-wrap: wrap;
li {
+ margin: 0 13px;
width: 84px;
height: 76px;
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index e1016e0..dfdb3a6 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -39,15 +39,15 @@
<el-submenu index="service">
<template slot="title"> <i class='custom-icon menu-shfw'></i> 生活服务设施</template>
<!-- <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item> -->
- <el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/medical">社区医疗</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/showers">社区浴室</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/medical">社区医疗</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/showers">社区浴室</el-menu-item> -->
<!-- <el-menu-item index="/pcLayout/default/service/transfer">圈存机</el-menu-item> -->
- <el-menu-item index="/pcLayout/default/service/copy">打字复印</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/bank">银行网点</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/aed">AED</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/service">通信营业厅</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/service/copy">打字复印</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/bank">银行网点</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/aed">AED</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/service/service">通信营业厅</el-menu-item> -->
<el-menu-item index="/pcLayout/default/service/park">停车场</el-menu-item>
<el-menu-item index="/pcLayout/default/service/alleyway">出入口</el-menu-item>
</el-submenu>
diff --git a/src/styles/entitys/text-entitys.scss b/src/styles/entitys/text-entitys.scss
index 830f430..68f7e62 100644
--- a/src/styles/entitys/text-entitys.scss
+++ b/src/styles/entitys/text-entitys.scss
@@ -47,6 +47,8 @@
}
}
.tag-entitys-box {
+ margin-left: 24px;
+ margin-bottom: 44px;
height: 28px;
.tag-content {
@@ -91,6 +93,9 @@
}
.way-entitys-box {
+ margin-left: 40px;
+ margin-bottom: 40px;
+
.way-title {
border: white 1px solid;
padding-left: 2px;
--
Gitblit v1.9.3