From c4b6346aa213ccd39a708936ab5516768d4c6e73 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Fri, 14 Jun 2024 10:19:48 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hdDetail/hdDetail.vue         |  2 ++
 pages/hdDetail/jcsj/jcsjTable.vue   | 11 +++++++++--
 pages/homeIndex/index.vue           |  4 ++--
 pages/rain/Table.vue                | 12 ++++++++++--
 pages/rain/rain.vue                 |  7 ++++---
 pages/rainDetail/jcsj/jcsjTable.vue | 13 ++++++++++---
 pages/rainDetail/rainDetail.vue     |  2 ++
 pages/skDetail/jcsj/jcsjTable.vue   | 11 +++++++++--
 pages/skDetail/skDetail.vue         | 16 ++++++++++------
 pages/water/hdWater/table.vue       | 13 ++++++++++---
 pages/water/skWater/table.vue       | 20 ++++++++++++++------
 pages/water/water.vue               |  3 +--
 12 files changed, 83 insertions(+), 31 deletions(-)

diff --git a/pages/hdDetail/hdDetail.vue b/pages/hdDetail/hdDetail.vue
index 3c22e8a..7ae8acc 100644
--- a/pages/hdDetail/hdDetail.vue
+++ b/pages/hdDetail/hdDetail.vue
@@ -69,6 +69,8 @@
 
 <style lang="scss" scoped>
   .rain-detail-box{
+    height: 100vh;
+    overflow: hidden;
     position: relative;
     .nav-bar{
       display: flex;
diff --git a/pages/hdDetail/jcsj/jcsjTable.vue b/pages/hdDetail/jcsj/jcsjTable.vue
index 442b0cc..3587e27 100644
--- a/pages/hdDetail/jcsj/jcsjTable.vue
+++ b/pages/hdDetail/jcsj/jcsjTable.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="table_div">
               <div class="table_cur">
-                <table>
+                <table style="width:100%;display:block">
                   <tr>
                     <th style="width: 40px;">
                       序号
@@ -20,7 +20,8 @@
                           </view>
                           </th>
                   </tr>
-                  <div style="max-height: 480px; overflow-y: auto">
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
                       <td style="width: 30px">{{ index + 1 }}</td>
                       <td style="width: 80px;">{{ item.tm }}</td>
@@ -28,6 +29,7 @@
                       <td style="width: 100px">{{ item.z ? item.z.toFixed(2) : "-" }}</td>
                       <td style="width: 80px">{{ item.tq ? item.tq : "-" }}</td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
                 </table>
               </div>
@@ -72,6 +74,11 @@
     empty-cells: show;
     border-collapse: collapse;
     font-size: 14px;
+  }
+    .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
   }
   .table_cur tr {
     display: flex;
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 38a4943..502506d 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -76,9 +76,9 @@
         }}</span
         >mm，
         <template v-if="list.data.cntDrp10 != 0"
-          ><span class="b1">10mm</span>以下测站数为<apan class="ye">{{
+          ><span class="b1">10mm</span>以下测站数为<span class="ye">{{
             list.data.cntDrp10
-          }}</apan
+          }}</span
           >个。</template
         ><template v-if="list.data.cntDrp25 != 0"
           ><span class="b1">10mm至25mm</span>以下测站数为<span class="ye">{{
diff --git a/pages/rain/Table.vue b/pages/rain/Table.vue
index aac85df..cc04083 100644
--- a/pages/rain/Table.vue
+++ b/pages/rain/Table.vue
@@ -19,7 +19,8 @@
                     <th style="width: 22%">
                       <div style="margin-top: 6px;">所属政区</div></th>
                   </tr>
-                  <div :style="{'max-height':height + 'px', 'overflow-y': 'auto',width:'100%'}">
+                  <!-- :style="{'max-height':height + 'px', 'overflow-y': 'auto',width:'100%'}" -->
+                  <div class="scroll-table">
                   <tr v-for="(item, index) in list" :key="index" style="width:100%">
                       <td style="width: 11%;">{{ index + 1 }}</td>
                       <td style="width: 27%; color: #3399ef; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">
@@ -28,7 +29,9 @@
                       <td style="width: 20%">{{ item.yesDrp || 0 }}</td>
                       <td style="width:23%;">{{ item.adnm }}</td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
+                  
                 </table>
               </div>
             </div>
@@ -68,6 +71,7 @@
     flex: 1;
     padding-top: 0px;
     overflow-x: scroll;
+    padding: 0 10px;
   }
   /*table样式*/
   .table_cur {
@@ -91,7 +95,11 @@
     white-space: nowrap;
     text-align: center !important;
   }
-  
+  .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
+  }
   .table_cur td {
     height: 65rpx;
     // border-bottom: 1px solid #d8ddeb;
diff --git a/pages/rain/rain.vue b/pages/rain/rain.vue
index 8de9533..4da4b68 100644
--- a/pages/rain/rain.vue
+++ b/pages/rain/rain.vue
@@ -1,6 +1,6 @@
 <template>
- <view class="rain-box" style="overflow:hidden">
-  <u-status-bar></u-status-bar>
+ <view class="rain-box" style="overflow:hidden;height:100vh">
+  <u-status-bar ></u-status-bar>
   <!-- <view style="height: var(--status-bar-height); width: 100%;"></view> -->
     <view class="nav-bar">
           <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
@@ -232,7 +232,8 @@
             // etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"),
             // stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm")
           },
-          tableHeight:0
+          tableHeight:0,
+          
   			}
   		},
       components:{
diff --git a/pages/rainDetail/jcsj/jcsjTable.vue b/pages/rainDetail/jcsj/jcsjTable.vue
index e07314d..35210d1 100644
--- a/pages/rainDetail/jcsj/jcsjTable.vue
+++ b/pages/rainDetail/jcsj/jcsjTable.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="table_div">
               <div class="table_cur">
-                <table>
+                <table style="width:100%;display:block">
                   <tr>
                     <th style="width: 50px;">
                       序号
@@ -11,12 +11,14 @@
                       小时雨量(mm)
                       </th>
                   </tr>
-                  <div style="max-height: 320px; overflow-y: auto">
-                <tr v-for="(item, index) in tableData" :key="index">
+                  <!-- style="max-height: 320px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                  <tr v-for="(item, index) in tableData" :key="index">
                       <td style="width: 50px">{{ index + 1 }}</td>
                       <td style="width: 200px;">{{ item.time }}</td>
                       <td style="width: 150px">{{ item.sumDrp }}</td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
                 </table>
               </div>
@@ -69,6 +71,11 @@
     white-space: nowrap;
     text-align: center !important;
   }
+   .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
+  }
   
   .table_cur td {
     height: 65rpx;
diff --git a/pages/rainDetail/rainDetail.vue b/pages/rainDetail/rainDetail.vue
index 93ce62a..7e2e7be 100644
--- a/pages/rainDetail/rainDetail.vue
+++ b/pages/rainDetail/rainDetail.vue
@@ -57,6 +57,8 @@
 
 <style lang="scss" scoped>
   .rain-detail-box{
+    height: 100vh;
+    overflow: hidden;
     .nav-bar{
       display: flex;
       justify-content: center;
diff --git a/pages/skDetail/jcsj/jcsjTable.vue b/pages/skDetail/jcsj/jcsjTable.vue
index 1a8300b..c06387a 100644
--- a/pages/skDetail/jcsj/jcsjTable.vue
+++ b/pages/skDetail/jcsj/jcsjTable.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="table_div">
               <div class="table_cur">
-                <table>
+                <table style="width:100%;display:block">
                   <tr>
                     <th style="width: 40px;">
                       序号
@@ -20,7 +20,8 @@
                           </view>
                           </th>
                   </tr>
-                  <div style="max-height: 480px; overflow-y: auto">
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
                       <td style="width: 30px">{{ index + 1 }}</td>
                       <td style="width: 80px;">{{ item.tm }}</td>
@@ -28,6 +29,7 @@
                       <td style="width: 100px">{{ item.rz ? item.rz.toFixed(2) : "-" }}</td>
                       <td style="width: 80px">{{ item.w ? item.w : "-" }}</td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
                 </table>
               </div>
@@ -72,6 +74,11 @@
     empty-cells: show;
     border-collapse: collapse;
     font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
   }
   .table_cur tr {
     display: flex;
diff --git a/pages/skDetail/skDetail.vue b/pages/skDetail/skDetail.vue
index bd6c6cd..60db161 100644
--- a/pages/skDetail/skDetail.vue
+++ b/pages/skDetail/skDetail.vue
@@ -11,27 +11,29 @@
       <uni-swiper-dot :info="Array(2).fill(0)" :current="current"  field="content" :dotsStyles="dotsStyles">
       	<swiper class="swiper-box" style="height: 30px;" @change="change">
       		<swiper-item >
-            <view style="display: flex;">
+            <view style="display: flex;justify-content: space-between;">
             <view class="jcsj" @click="activeOne = 0" :class="{'active':activeOne == 0}">
               监测数据
             </view>
-            <view class="tjsj" @click="activeOne = 1" :class="{'active':activeOne == 1}" style="margin: 0 25px;">
+            <!-- style="margin: 0 25px;" -->
+            <view class="tjsj" @click="activeOne = 1" :class="{'active':activeOne == 1}" style="margin: 0 4%">
               统计数据
             </view>
-            <view class="tjsj" @click="activeOne = 2" :class="{'active':activeOne == 2}" style="margin: 0 25px 0 0;">
+            <!-- style="margin: 0 25px 0 0;" -->
+            <view class="zrtx" @click="activeOne = 2" :class="{'active':activeOne == 2}" >
               责任体系
             </view>
-            <view class="tjsj" @click="activeOne = 3" :class="{'active':activeOne == 3}" >
+            <view class="txjc" @click="activeOne = 3" :class="{'active':activeOne == 3}" style="margin-left:4%">
               图像监测
             </view>
             </view>
       		</swiper-item>
           <swiper-item >
             <view style="display: flex;">
-          <view class="spjk" @click="activeOne = 4" :class="{'active':activeOne == 4}">
+          <view class="spjk" @click="activeOne = 4" :class="{'active':activeOne == 4}" style="margin-right:4%">
             视频监控
           </view>
-          <view class="zbyq" @click="activeOne = 5" :class="{'active':activeOne == 5}" style="margin-left: 25px;">
+          <view class="zbyq" @click="activeOne = 5" :class="{'active':activeOne == 5}" >
             周边雨情
           </view>
             </view>
@@ -113,6 +115,8 @@
 
 <style lang="scss" scoped>
   .rain-detail-box{
+    height: 100vh;
+    overflow: hidden;
     position: relative;
     .nav-bar{
       display: flex;
diff --git a/pages/water/hdWater/table.vue b/pages/water/hdWater/table.vue
index 3a5609b..6fdb6d2 100644
--- a/pages/water/hdWater/table.vue
+++ b/pages/water/hdWater/table.vue
@@ -8,14 +8,14 @@
                       </th>
                     <th style="width: 32%">
                      站名
-                    <th style="width: 32%;">
+                    <th style="width: 31%;">
                       监测时间
                       </th>
-                    <th style="width: 25%;" >
+                    <th style="width: 26%;" >
                       实时水位(m)
                       </th>
                       </tr>
-                  <div :style="{'max-height':height + 'px', 'overflow-y': 'auto'}">
+                  <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
                       <td style="width: 11%">{{ index + 1 }}</td>
                       <td style="width: 32%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
@@ -28,6 +28,7 @@
                        top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text>
                       </td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
                 </table>
               </div>
@@ -74,6 +75,7 @@
     flex: 1;
     padding-top: 0px;
     overflow-x: scroll;
+    padding: 0 10px;
   }
   /*table样式*/
   .table_cur {
@@ -86,6 +88,11 @@
     display: flex;
     line-height: 80rpx;
   }
+  .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
+  }
   .table_cur th {
     height: 80rpx;
     color: #3399ef;
diff --git a/pages/water/skWater/table.vue b/pages/water/skWater/table.vue
index a9ba23d..266eb8e 100644
--- a/pages/water/skWater/table.vue
+++ b/pages/water/skWater/table.vue
@@ -6,7 +6,7 @@
                     <th style="width: 11%;">
                       序号
                       </th>
-                    <th style="width: 24%">
+                    <th style="width: 22%">
                      站名
                     <th style="width: 22%;">
                       监测时间
@@ -14,14 +14,14 @@
                     <th style="width: 25%;" >
                       实时水位(m)
                       </th>
-                      <th style="width: 20%;" >
+                      <th style="width: 22%;" >
                         超汛限(m)
                         </th>
                       </tr>
-                  <div :style="{'max-height':height + 'px', 'overflow-y': 'auto'}">
+                  <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
-                      <td style="width: 11%">{{ index + 1 }}</td>
-                      <td style="width: 24%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
+                      <td style="width: 10%">{{ index + 1 }}</td>
+                      <td style="width: 23%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
                       <td style="width: 22%">{{item.tm}}</td>
                       <td style="width: 25%; position: relative;" >
                         <text :class="{'active1':item.flState	 == 1,'active2':item.desState == 1,'active3':item.calState}">{{ item.rz.toFixed(2) }}</text>
@@ -30,8 +30,9 @@
                        <text v-else-if="item.state == 2" style="position: absolute;
                        top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text>
                       </td>
-                      <td style="width: 20%">{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}</td>
+                      <td style="width: 22%">{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}</td>
                     </tr>
+                    <div style="height:125px"></div>
                   </div>
                 </table>
               </div>
@@ -79,6 +80,8 @@
     flex: 1;
     padding-top: 0px;
     overflow-x: scroll;
+    padding: 0 10px;
+
   }
   /*table样式*/
   .table_cur {
@@ -91,6 +94,11 @@
     display: flex;
     line-height: 80rpx;
   }
+  .scroll-table{
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+    width:'100%'
+  }
   .table_cur th {
     height: 80rpx;
     color: #3399ef;
diff --git a/pages/water/water.vue b/pages/water/water.vue
index 54a0e87..72e49ec 100644
--- a/pages/water/water.vue
+++ b/pages/water/water.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="water-box">
+  <view class="water-box" style="overflow:hidden;height:100vh">
   <u-status-bar></u-status-bar>
    <view class="nav-bar">
          <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
@@ -43,7 +43,6 @@
       }
     },
        onReady(){
-      console.log(123333);
       let that = this
         uni.getSystemInfo({
           success: (res) => {