From 3e8003d111e8535ffdb1a1188fe4ca9c2ca8e18f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 16:35:33 +0800
Subject: [PATCH] 弹框窗口大小问题修改

---
 src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue |    4 +-
 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue |    5 +-
 src/components/BaseNav/PublicBounced/PublicBounced.vue             |   52 +++++++++++++-------------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 262f1c9..9d971cd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -84,7 +84,8 @@
 .win {
   position: relative;
   background-color: rgba(33, 41, 69, 0.9);
-  min-height: 354px;
+  //min-height: 354px;
+  height: 208px;
 }
 
 .main {
@@ -93,7 +94,7 @@
 
   .main-table {
     width: 100%;
-    min-height: 195px;
+    //min-height: 195px;
     //border: 1px @color solid;
 
     video {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index ab9246b..fa9642f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -26,15 +26,15 @@
 .win {
   position: relative;
   background-color: rgba(33, 41, 69,0.9);
+  height: 300px;
 }
 .main {
   border: 1px solid #396d83;
   padding: 6px;
   //.main-video {
-    height: 432px;
     video {
       width: 100%;
-      height: 432px;
+      height: 100%;
       outline: none;
     }
   //}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 6cdf973..d39f737 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -19,32 +19,32 @@
         <public-video></public-video>
       </div>
     </div>
-  </div>
-<!--  <el-dialog-->
-<!--      :visible.sync="flag"-->
-<!--      width="70%"-->
-<!--      class="public-bounced"-->
-<!--      :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>-->
+<!--    <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>-->
-<!--      <div class="public-bounced-content-right">-->
-<!--        <public-video></public-video>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--  </el-dialog>-->
+<!--    </el-dialog>-->
+  </div>
 </template>
 
 <script>
@@ -117,8 +117,8 @@
 <style lang="less" scoped>
 .public-bounced {
   width: 75%;
-  //height: 540px;
-  height: 65%;
+  //height: 520px;
+  height: 40%;
   z-index: 999;
   position: absolute;
   bottom: 5%;

--
Gitblit v1.8.0