xielei
/
xytSk-App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://local.gunshiiot.com:10000/lishenfeng/xffxkh-app

master
张林 2024-06-24 09:57:13 +08:00
parent 8aa407f7f2 65f130e52a
commit 7a3a59ccf7
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/hdDetail/jcsj/jcsj.vue
View File

@ -28,9 +28,10 @@
<view class="jcsj-charts" v-if="selactOne == 0"> <view class="jcsj-charts" v-if="selactOne == 0">
<qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" /> <qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
</view> </view>
</view>
<view style="margin-top: 20px;" v-if="selactOne == 1"> <view style="margin-top: 20px;" v-if="selactOne == 1">
<JcsjTable :tableData="tableData" /> <JcsjTable :tableData="tableData" />
</view>
<view style="height:300px" v-if="selactOne == 0"></view>
</view> </view>
<u-datetime-picker <u-datetime-picker
:show="showTime" :show="showTime"
@ -148,7 +149,7 @@
} }
} }
.jcsj-content{ .jcsj-content{
max-height:calc(100vh - 89px - 43px - 45px); max-height:100vh;
overflow-y:auto overflow-y:auto
} }
.jcsj-charts{ .jcsj-charts{

3
pages/hdDetail/tjsj/tjsj.vue
View File

@ -88,6 +88,7 @@
<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view> <view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<view style="height:150px"></view>
</view> </view>
</template> </template>
@ -139,6 +140,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.tjsj-box{ .tjsj-box{
max-height: 100vh;
overflow-y: auto;
.tjsj-row{ .tjsj-row{
.first-row{ .first-row{
line-height: 40px; line-height: 40px;

3
pages/hdDetail/zbyq/zbyq.vue
View File

@ -21,6 +21,7 @@
<view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;"> <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
<ResList :info="item" /> <ResList :info="item" />
</view> </view>
<view style="height:300px"></view>
</view> </view>
<u-popup :show="popupOpen" mode="right" @close="popupOpen=false" > <u-popup :show="popupOpen" mode="right" @close="popupOpen=false" >
<view style="padding: 30px 20px;"> <view style="padding: 30px 20px;">
@ -148,7 +149,7 @@
} }
.content{ .content{
margin-top: 10px; margin-top: 10px;
max-height: 580px; max-height: 100vh;
overflow-y: auto; overflow-y: auto;
} }

2
pages/homeIndex/index.vue
View File

@ -219,7 +219,7 @@
<div class="time">{{ imgHourstm[0] }} 至 {{ imgHourstm[1] }}</div> <div class="time">{{ imgHourstm[0] }} 至 {{ imgHourstm[1] }}</div>
</div> </div>
<div class="imgs" style="height: 100%; text-align: center"> <div class="imgs" style="height: 100%; text-align: center">
<image :src="imgHoursList.url" mode="aspectFit"></image> <image :src="imgHoursList.url" mode="aspectFit" v-if="imgHoursList"></image>
</div> </div>
</view> </view>
</view> </view>

3
pages/rainDetail/zbyq/zbyq.vue
View File

@ -21,6 +21,7 @@
<view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;"> <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
<ResList :info="item" /> <ResList :info="item" />
</view> </view>
<view style="height:300px"></view>
</view> </view>
<u-popup :show="popupOpen" mode="right" @close="popupOpen=false" > <u-popup :show="popupOpen" mode="right" @close="popupOpen=false" >
<view style="padding: 30px 20px;"> <view style="padding: 30px 20px;">
@ -148,7 +149,7 @@
} }
.content{ .content{
margin-top: 10px; margin-top: 10px;
max-height: 580px; max-height: 100vh;
overflow-y: auto; overflow-y: auto;
} }

8
pages/skDetail/jcsj/jcsj.vue
View File

@ -27,10 +27,11 @@
<view class="jcsj-content"> <view class="jcsj-content">
<view class="jcsj-charts" v-if="selactOne == 0"> <view class="jcsj-charts" v-if="selactOne == 0">
<qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" /> <qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
</view>
</view> </view>
<view style="margin-top: 20px;" v-if="selactOne == 1"> <view style="margin-top: 20px;" v-if="selactOne == 1">
<JcsjTable :tableData="tableData" /> <JcsjTable :tableData="tableData" />
</view>
<view style="height:300px" v-if="selactOne == 0"></view>
</view> </view>
<u-datetime-picker <u-datetime-picker
:show="showTime" :show="showTime"
@ -148,11 +149,12 @@
} }
} }
.jcsj-content{ .jcsj-content{
max-height:calc(100vh - 89px - 43px - 45px); max-height:100vh;
width: 100%;
overflow-y:auto overflow-y:auto
} }
.jcsj-charts{ .jcsj-charts{
width:100%; // width:103vw;
height: 500px; height: 500px;
overflow-y: auto; overflow-y: auto;
margin-top: 20px; margin-top: 20px;

3
pages/skDetail/tjsj/tjsj.vue
View File

@ -88,6 +88,7 @@
<view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view> <view class="second-row" style="border-bottom: 1px solid #dfdfdf;">{{tableData.maxRz ? tableData.maxRz.toFixed(2) :0}}</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<view style="height:150px"></view>
</view> </view>
</template> </template>
@ -139,6 +140,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.tjsj-box{ .tjsj-box{
max-height: 100vh;
overflow-y: auto;
.tjsj-row{ .tjsj-row{
.first-row{ .first-row{
line-height: 40px; line-height: 40px;

3
pages/skDetail/zbyq/zbyq.vue
View File

@ -21,6 +21,7 @@
<view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;"> <view v-for="(item,index) in list" :key="index" style="margin-bottom: 5px;">
<ResList :info="item" /> <ResList :info="item" />
</view> </view>
<view style="height:300px"></view>
</view> </view>
<u-popup :show="popupOpen" mode="right" @close="popupOpen=false" > <u-popup :show="popupOpen" mode="right" @close="popupOpen=false" >
<view style="padding: 30px 20px;"> <view style="padding: 30px 20px;">
@ -148,7 +149,7 @@
} }
.content{ .content{
margin-top: 10px; margin-top: 10px;
max-height: 580px; max-height: 100vh;
overflow-y: auto; overflow-y: auto;
} }