From 33a730d973ddb59aa415c0718b9d214b39573c15 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Thu, 20 Jun 2024 17:08:43 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hdDetail/jcsj/jcsj.vue   | 5 +++--
 pages/hdDetail/tjsj/tjsj.vue   | 3 +++
 pages/hdDetail/zbyq/zbyq.vue   | 3 ++-
 pages/homeIndex/index.vue      | 2 +-
 pages/rainDetail/zbyq/zbyq.vue | 3 ++-
 pages/skDetail/jcsj/jcsj.vue   | 8 +++++---
 pages/skDetail/tjsj/tjsj.vue   | 3 +++
 pages/skDetail/zbyq/zbyq.vue   | 3 ++-
 8 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pages/hdDetail/jcsj/jcsj.vue b/pages/hdDetail/jcsj/jcsj.vue
index 7583803..97254e3 100644
--- a/pages/hdDetail/jcsj/jcsj.vue
+++ b/pages/hdDetail/jcsj/jcsj.vue
@@ -28,9 +28,10 @@
     <view class="jcsj-charts" v-if="selactOne == 0">
       <qiun-data-charts  :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
     </view>
-    </view>
    <view style="margin-top: 20px;" v-if="selactOne == 1">
       <JcsjTable :tableData="tableData" />
+    </view>
+      <view style="height:300px" v-if="selactOne == 0"></view>
     </view>
     <u-datetime-picker
                 :show="showTime"
@@ -148,7 +149,7 @@
     }
   }
    .jcsj-content{
-    max-height:calc(100vh - 89px - 43px - 45px);
+    max-height:100vh;
     overflow-y:auto
   }
   .jcsj-charts{
diff --git a/pages/hdDetail/tjsj/tjsj.vue b/pages/hdDetail/tjsj/tjsj.vue
index f02303e..8bed79b 100644
--- a/pages/hdDetail/tjsj/tjsj.vue
+++ b/pages/hdDetail/tjsj/tjsj.vue
@@ -88,6 +88,7 @@
             	<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
             </uni-col>
    				</uni-row>
+    <view style="height:150px"></view>      
   </view>
 </template>
 
@@ -139,6 +140,8 @@
 
 <style lang="scss" scoped>
   .tjsj-box{
+    max-height: 100vh;
+    overflow-y: auto;
     .tjsj-row{
       .first-row{
         line-height: 40px;
diff --git a/pages/hdDetail/zbyq/zbyq.vue b/pages/hdDetail/zbyq/zbyq.vue
index 3d64b03..c137a05 100644
--- a/pages/hdDetail/zbyq/zbyq.vue
+++ b/pages/hdDetail/zbyq/zbyq.vue
@@ -21,6 +21,7 @@
       <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
         <ResList :info="item" />
       </view>
+      <view style="height:300px"></view>
     </view>
     <u-popup :show="popupOpen" mode="right"  @close="popupOpen=false" >
                 <view style="padding: 30px 20px;">
@@ -148,7 +149,7 @@
     }
     .content{
       margin-top: 10px;
-      max-height: 580px;
+      max-height: 100vh;
       overflow-y: auto;
     }
    
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 40f1afc..20043a7 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -219,7 +219,7 @@
           <div class="time">{{ imgHourstm[0] }} 至 {{ imgHourstm[1] }}</div>
         </div>
         <div class="imgs" style="height: 100%; text-align: center">
-          <image :src="imgHours.url" mode="aspectFit"></image>
+          <image :src="imgHours.url" mode="aspectFit" v-if="imgHours"></image>
         </div>
       </view>
     </view>
diff --git a/pages/rainDetail/zbyq/zbyq.vue b/pages/rainDetail/zbyq/zbyq.vue
index 76a2e22..16567ee 100644
--- a/pages/rainDetail/zbyq/zbyq.vue
+++ b/pages/rainDetail/zbyq/zbyq.vue
@@ -21,6 +21,7 @@
       <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
         <ResList :info="item" />
       </view>
+      <view style="height:300px"></view>
     </view>
     <u-popup :show="popupOpen" mode="right"  @close="popupOpen=false" >
                 <view style="padding: 30px 20px;">
@@ -148,7 +149,7 @@
     }
     .content{
       margin-top: 10px;
-      max-height: 580px;
+      max-height: 100vh;
       overflow-y: auto;
     }
    
diff --git a/pages/skDetail/jcsj/jcsj.vue b/pages/skDetail/jcsj/jcsj.vue
index 3bfd08b..c94710c 100644
--- a/pages/skDetail/jcsj/jcsj.vue
+++ b/pages/skDetail/jcsj/jcsj.vue
@@ -27,10 +27,11 @@
     <view class="jcsj-content">
     <view class="jcsj-charts" v-if="selactOne == 0">
       <qiun-data-charts  :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
-    </view>
     </view>
      <view style="margin-top: 20px;" v-if="selactOne == 1">
       <JcsjTable :tableData="tableData" />
+    </view>
+      <view style="height:300px" v-if="selactOne == 0"></view>
     </view>
       <u-datetime-picker
                 :show="showTime"
@@ -148,11 +149,12 @@
     }
   }
    .jcsj-content{
-    max-height:calc(100vh - 89px - 43px - 45px);
+    max-height:100vh;
+    width: 100%;
     overflow-y:auto
   }
   .jcsj-charts{
-    width:100%;
+    // width:103vw;
     height: 500px;
     overflow-y: auto;
     margin-top: 20px;
diff --git a/pages/skDetail/tjsj/tjsj.vue b/pages/skDetail/tjsj/tjsj.vue
index 486975e..a662400 100644
--- a/pages/skDetail/tjsj/tjsj.vue
+++ b/pages/skDetail/tjsj/tjsj.vue
@@ -88,6 +88,7 @@
             	<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
             </uni-col>
    				</uni-row>
+    <view style="height:150px"></view>      
   </view>
 </template>
 
@@ -139,6 +140,8 @@
 
 <style lang="scss" scoped>
   .tjsj-box{
+    max-height: 100vh;
+    overflow-y: auto;
     .tjsj-row{
       .first-row{
         line-height: 40px;
diff --git a/pages/skDetail/zbyq/zbyq.vue b/pages/skDetail/zbyq/zbyq.vue
index 3d64b03..c137a05 100644
--- a/pages/skDetail/zbyq/zbyq.vue
+++ b/pages/skDetail/zbyq/zbyq.vue
@@ -21,6 +21,7 @@
       <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
         <ResList :info="item" />
       </view>
+      <view style="height:300px"></view>
     </view>
     <u-popup :show="popupOpen" mode="right"  @close="popupOpen=false" >
                 <view style="padding: 30px 20px;">
@@ -148,7 +149,7 @@
     }
     .content{
       margin-top: 10px;
-      max-height: 580px;
+      max-height: 100vh;
       overflow-y: auto;
     }