From d73efce8923602f04d1d56049fd8494ad1efc020 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 18:07:33 +0800
Subject: [PATCH] 弹框窗口大小问题修改
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 162 ++++++++++++++------------
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 52 ++++---
src/assets/css/map/map-panel-style.less | 1
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 19 --
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 44 +------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 75 ++++++------
6 files changed, 164 insertions(+), 189 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 3a72b11..1a3ca97 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -293,6 +293,7 @@
}
.el-table td, .el-table th.is-leaf {
border: none;
+ font-size: 0.08rem;
}
.el-table .warning-row {
background: #28304d;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 3f68e5d..a17a64a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -1,17 +1,17 @@
<template>
- <div class="win">
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
- </ul>
- <component :is="currentTab" v-bind="$attrs"></component>
- </div>
+ <div class="win">
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <ul class="tab">
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" v-bind="$attrs"></component>
+ </div>
</template>
<script>
@@ -38,67 +38,77 @@
</script>
<style scoped>
- *{
- margin: 0;
- padding: 0;
- list-style: none;
- }
- .win {
- position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69,0.9);
- border: 0.8px solid #396d83;
- }
- .border_corner{
- z-index: 999;
- position: absolute;
- width: 10px;
- height: 10px;
- background: rgba(0,0,0,0);
- border: 1.5px solid #47d5ea;
- }
- .border_corner_left_top{
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
- }
- .border_corner_right_top{
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
- }
- .border_corner_left_bottom{
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
- }
- .border_corner_right_bottom{
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
- }
- .tab{
- display: flex;
- border-bottom: 1px solid #396d83;
- margin-bottom: 10px;
- }
- li{
- background-color: #243a55;
- margin: 10px 10px 2px 10px;
- /*padding: 5px 10px;*/
- width: 90px;
- height: 25px;
- line-height: 25px;
- text-align: center;
- border-radius: 5px;
- }
- ul li:hover{
- background-color: #0e639e;
- color: #682000;
- cursor: pointer;
- }
+* {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.win {
+ position: relative;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69, 0.9);
+ border: 0.8px solid #396d83;
+ height: 1.5rem;
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ background: rgba(0, 0, 0, 0);
+ border: 1.5px solid #47d5ea;
+}
+
+.border_corner_left_top {
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+
+.border_corner_right_top {
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+
+.border_corner_left_bottom {
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+}
+
+.border_corner_right_bottom {
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
+}
+
+.tab {
+ display: flex;
+ border-bottom: 1px solid #396d83;
+ margin-bottom: 10px;
+}
+
+li {
+ background-color: #243a55;
+ margin: 10px 10px 2px 10px;
+ /*padding: 5px 10px;*/
+ width: 90px;
+ height: 25px;
+ line-height: 25px;
+ text-align: center;
+ border-radius: 5px;
+}
+
+ul li:hover {
+ background-color: #0e639e;
+ color: #682000;
+ cursor: pointer;
+}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 9d971cd..fed1e41 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -8,9 +8,9 @@
<div class="main">
<div class="main-table">
<el-table :data="listData" style="width: 100%" stripe='stripe'
- :height="300"
tooltip-effect="dark" :row-class-name="tableRowClassName">
- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop" :label="item.label"></el-table-column>
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label"></el-table-column>
</el-table>
</div>
</div>
@@ -84,24 +84,13 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- //min-height: 354px;
- height: 208px;
+ //width: 6rem;
+ height: 1.5rem;
}
.main {
- width: 100%;
- height: 100%;
-
.main-table {
width: 100%;
- //min-height: 195px;
- //border: 1px @color solid;
-
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3b33e08..3aa7f07 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -53,37 +53,7 @@
props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- tabData: [],
- listLabel: [
- {
- label: '搴忓彿',
- prop: 'StoragePlaceId'
- },
- {
- label: '绫诲埆',
- prop: 'StoragePlaceTypeName'
- },
- {
- label: '鍥哄簾鍚嶇О',
- prop: 'StoragePlaceName'
- },
- {
- label: '浠ｇ爜',
- prop: 'StorageZDMJ'
- },
- {
- label: '浜х敓閲�(t)',
- prop: 'StorageZCL'
- },
- {
- label: '璐瓨閲�(t)',
- prop: 'StorageZCNL'
- },
- {
- label: '浜х敓瑁呯疆',
- prop: 'StorageType'
- }
- ]
+ tabData: []
}
},
mounted () {
@@ -106,17 +76,18 @@
position: relative;
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
+ //width: 6rem;
+ height: 0.5rem;
}
.main {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
.main-matter {
font-size: 13px;
font-weight: normal;
//padding: 10px 6px;
- min-height: 70px;
border: 1px solid #396d83;
.row-item-one {
@@ -145,8 +116,8 @@
}
ul {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
@@ -161,6 +132,7 @@
background-color: #243a55;
color: #00d0f9;
border-radius: 4px;
+ font-size: 0.08rem;
}
li:last-child {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index fa9642f..426879e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -1,17 +1,17 @@
<template>
- <div class="win" >
+ <div class="win">
<!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
<div class="border_corner border_corner_left_top"></div>
<div class="border_corner border_corner_right_top"></div>
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
-<!-- <div class="main-video">-->
- <video controls>
- <source src="movie.mp4" type="video/mp4">
- <source src="movie.ogg" type="video/ogg">
- </video>
-<!-- </div>-->
+ <!-- <div class="main-video">-->
+ <video controls>
+ <source src="movie.mp4" type="video/mp4">
+ <source src="movie.ogg" type="video/ogg">
+ </video>
+ <!-- </div>-->
</div>
</div>
</template>
@@ -25,47 +25,53 @@
<style scoped lang="less">
.win {
position: relative;
- background-color: rgba(33, 41, 69,0.9);
- height: 300px;
+ background-color: rgba(33, 41, 69, 0.9);
+ height: 2.1rem;
}
+
.main {
border: 1px solid #396d83;
- padding: 6px;
- //.main-video {
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
- //}
+ padding: 5px;
+ height: 2rem;
+
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
}
-.border_corner{
+
+.border_corner {
z-index: 999;
position: absolute;
width: 14px;
height: 14px;
- background: rgba(0,0,0,0);
+ background: rgba(0, 0, 0, 0);
border: 1px solid #47d5ea;
}
-.border_corner_left_top{
+
+.border_corner_left_top {
top: 0;
left: 0;
border-right: none;
border-bottom: none;
}
-.border_corner_right_top{
+
+.border_corner_right_top {
top: 0;
right: 0;
border-left: none;
border-bottom: none;
}
-.border_corner_left_bottom{
+
+.border_corner_left_bottom {
bottom: 0;
left: 0;
border-right: none;
border-top: none;
}
-.border_corner_right_bottom{
+
+.border_corner_right_bottom {
bottom: 0;
right: 0;
border-left: none;
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d39f737..8e57e7d 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -19,31 +19,31 @@
<public-video></public-video>
</div>
</div>
-<!-- <el-dialog-->
-<!-- :visible.sync="flag"-->
-<!-- width="70%"-->
-<!-- v-drag-->
-<!-- :modal="false">-->
-<!-- <div class="public-bounced-title">-->
-<!-- <span>{{ displayContentTitle }}</span>-->
-<!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
-<!-- </div>-->
-<!-- <div class="public-bounced-content">-->
-<!-- <div class="public-bounced-content-left">-->
-<!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
-<!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
-<!-- <div class="public-bounced-content-left-bottom">-->
-<!-- <public-table v-if="value === 'gufei'"-->
-<!-- :displayContentTable="displayContentTable"></public-table>-->
-<!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
-<!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="public-bounced-content-right">-->
-<!-- <public-video></public-video>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
+ <!-- <el-dialog-->
+ <!-- :visible.sync="flag"-->
+ <!-- width="70%"-->
+ <!-- v-drag-->
+ <!-- :modal="false">-->
+ <!-- <div class="public-bounced-title">-->
+ <!-- <span>{{ displayContentTitle }}</span>-->
+ <!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
+ <!-- </div>-->
+ <!-- <div class="public-bounced-content">-->
+ <!-- <div class="public-bounced-content-left">-->
+ <!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
+ <!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
+ <!-- <div class="public-bounced-content-left-bottom">-->
+ <!-- <public-table v-if="value === 'gufei'"-->
+ <!-- :displayContentTable="displayContentTable"></public-table>-->
+ <!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
+ <!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="public-bounced-content-right">-->
+ <!-- <public-video></public-video>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </el-dialog>-->
</div>
</template>
@@ -116,22 +116,24 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
- //height: 520px;
- height: 40%;
+ width: 10rem;
+ //height: 2.6rem;
+ //width: 70vw;
+ //height: 30vh;
z-index: 999;
position: absolute;
- bottom: 5%;
- left: 15%;
+ top: 5%;
+ left: 5%;
background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
+ height: 0.1rem;
border: 1px #a4c0d8 solid;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -148,22 +150,17 @@
}
.public-bounced-content {
- margin: 15px 0;
+ margin: 0.2rem auto !important;
display: flex;
//align-items: center;
justify-content: space-around;
- padding: 10px;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ width: 6.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ width: 3rem;
}
}
}
--
Gitblit v1.8.0