Merge branch 'lsf-dev'

pages/hdDetail/jcsj/jcsj.vue

@@ -24,9 +24,11 @@
       <text :class="{'active':selactOne == 0}" @click="selactOne = 0" style="display: inline-block; padding: 2px 20px; text-align: center; border: 1px solid #dfdfdf;">图</text>
       <text :class="{'active':selactOne == 1}" @click="selactOne = 1" style="display: inline-block; padding: 2px 20px; text-align: center; border: 1px solid #dfdfdf;">表</text>
     </view>
+    <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>
@@ -144,6 +146,10 @@
       margin: 3px 0 0 5px;
       // color: #3399ef;
     }
+  }
+   .jcsj-content{
+    max-height:calc(100vh - 89px - 43px - 45px);
+    overflow-y:auto
   }
   .jcsj-charts{
     width:100%;

pages/rainDetail/jcsj/jcsj.vue

@@ -20,11 +20,13 @@
 <!--    <view class="" style="width: 100%; height: 3px; background-color: #dfdfdf; margin-bottom: 2px;">
       
     </view> -->
+    <view class="jcsj-content">
     <view class="jcsj-charts">
       <qiun-data-charts  :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" /> 
     </view>
     <view class="jcsj-table">
       <JcsjTable :tableData="tableData" />
+    </view>
     </view>
      <u-datetime-picker
                 :show="showTime"
@@ -157,6 +159,10 @@
       // color: #3399ef;
     }
   }
+  .jcsj-content{
+    max-height:calc(100vh - 89px - 43px - 45px);
+    overflow-y:auto
+  }
   .jcsj-charts{
     width:100%;
     height: 300px;

pages/skDetail/jcsj/jcsj.vue

@@ -24,8 +24,10 @@
       <text :class="{'active':selactOne == 0}" @click="selactOne = 0" style="display: inline-block; padding: 2px 20px; text-align: center; border: 1px solid #dfdfdf;">图</text>
       <text :class="{'active':selactOne == 1}" @click="selactOne = 1" style="display: inline-block; padding: 2px 20px; text-align: center; border: 1px solid #dfdfdf;">表</text>
     </view>
+    <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" />
@@ -144,6 +146,10 @@
       margin: 3px 0 0 5px;
       // color: #3399ef;
     }
+  }
+   .jcsj-content{
+    max-height:calc(100vh - 89px - 43px - 45px);
+    overflow-y:auto
   }
   .jcsj-charts{
     width:100%;

pages/water/hdWater/table.vue

@@ -18,7 +18,7 @@
                   <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>
+                      <td style="width: 30%;color: #3399ef;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">{{ item.stnm }}</td>
                       <td style="width: 32%">{{item.tm}}</td>
                       <td style="width: 25%; position: relative;" >
                         <text :class="{'active1':item.gstate == 1,'active2':item.wstate == 1}">{{ item.z.toFixed(2) }}</text>

pages/water/skWater/table.vue

@@ -21,7 +21,7 @@
                   <div class="scroll-table">
                 <tr v-for="(item, index) in newList" :key="index">
                       <td style="width: 10%">{{ index + 1 }}</td>
-                      <td style="width: 23%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
+                      <td style="width: 23%;color: #3399ef;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @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>