From dd3060d87943cfdd025729da5a088a0f9910f395 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 11:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WireSurface/index.js | 45 +++++++++++-----------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 73 +++++++++++++++---------------------
2 files changed, 53 insertions(+), 65 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 550e6e8..003f1dc 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,8 +1,11 @@
<template>
<div class="public-bounced" v-show="flag">
- <div class="popup_title">{{ displayContent.Name }}</div>
- <div class="popup_bottom">
- <button @click="closePopup">纭畾</button>
+ <div class="public-bounced-title">
+ <span>{{ displayContent.Name }}</span>
+ <i class="el-icon-circle-close" @click="closePopup"></i>
+ </div>
+ <div class="public-bounced-content">
+ <span>鍐呭</span>
</div>
</div>
</template>
@@ -29,52 +32,38 @@
}
</script>
-<style scoped>
+<style lang="less" scoped>
.public-bounced {
width: 80%;
- z-index: 499;
+ height: 450px;
+ z-index: 999;
position: absolute;
- top: 15%;
+ top: 25%;
left: 10%;
- background-color: rgba(128, 128, 128, 0.507);
- padding: 1%;
- border-radius: 20px;
- margin: 10% auto;
-}
+ background-color: #002432;
+ margin: 1% auto;
+ border: 1px #a5bfd8 solid;
-.popup_title {
- text-align: center;
- font-weight: 600;
- font-size: 30px;
-}
+ .public-bounced-title {
+ width: 100%;
+ border: 1px #a4c0d8 solid;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
-.popup_center {
- padding: 10%;
- font-size: 20px;
-}
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
+ }
-.popup_bottom {
- display: flex;
- justify-content: space-around;
-}
+ i {
+ color: white;
+ margin: 0 15px;
+ font-size: 22px;
+ }
+ }
-button {
- width: 25%;
- height: 20%;
- padding: 2%;
- border: 1px solid gray;
- border-radius: 10px;
-}
-
-button:nth-child(1) {
- background-color: orangered;
- color: white;
- font-size: 20px;
-}
-
-button:nth-child(2) {
- background-color: gray;
- color: black;
- font-size: 20px;
}
</style>
diff --git a/src/components/BaseNav/WireSurface/index.js b/src/components/BaseNav/WireSurface/index.js
index 6d04ade..3021c37 100644
--- a/src/components/BaseNav/WireSurface/index.js
+++ b/src/components/BaseNav/WireSurface/index.js
@@ -1,23 +1,22 @@
-
-// 寮曞叆鐢ㄤ簬澶勭悊鎺ュ彛鏁版嵁鑾峰彇鐨勬柟娉�
-import { getDataInitWireSurface } from '@src/api/request'
-
-class initWireSurface {
- constructor (options) {
- this.map = options.map
- this.L = window.L
- this.initWireSurfaceMap = new Map()
- this.initWireSurfacePopup = this.L.layerGroup().addTo(this.map)
- }
-
- // 鑾峰彇椤甸潰绾�/闈㈡暟鎹�
- getDataInitWireSurface () {
- getDataInitWireSurface().then(res => {
- console.log(res)
- }).catch(error => {
- console.log(error)
- })
- }
-}
-
-export default initWireSurface
+// // 寮曞叆鐢ㄤ簬澶勭悊鎺ュ彛鏁版嵁鑾峰彇鐨勬柟娉�
+// import {} from '@src/api/request'
+//
+// class initWireSurface {
+// constructor (options) {
+// this.map = options.map
+// this.L = window.L
+// this.initWireSurfaceMap = new Map()
+// this.initWireSurfacePopup = this.L.layerGroup().addTo(this.map)
+// }
+//
+// // 鑾峰彇椤甸潰绾�/闈㈡暟鎹�
+// getDataInitWireSurface () {
+// ().then(res => {
+// console.log(res)
+// }).catch(error => {
+// console.log(error)
+// })
+// }
+// }
+//
+// export default initWireSurface
--
Gitblit v1.8.0