From 181c63668c5d81002fa2dd4f5312318cf81f2180 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 15:50:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 550e6e8..dab29fe 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,23 @@
<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">
+ <div class="public-bounced-content-left"></div>
+ <div class="public-bounced-content-right"></div>
+<!-- <span>鍐呭</span>-->
+ <popup-gas></popup-gas>
</div>
</div>
</template>
<script>
+import '@/components/BaseNav/SolidWaste/directive'
+
+import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
data () {
@@ -16,6 +25,9 @@
displayContent: [],
flag: false
}
+ },
+ components: {
+ PopupGas
},
methods: {
setData (data) {
@@ -29,52 +41,56 @@
}
</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 #9fc5c8 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;
-}
+ .public-bounced-content {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ .public-bounced-content-left {
+ width: 48%;
+ height: 400px;
+ border: 1px red solid;
+ }
+ .public-bounced-content-right {
+ width: 48%;
+ height: 400px;
+ border: 1px red solid;
+ }
+ }
-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>
--
Gitblit v1.8.0