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

Merge branch 'lsf-dev'

master
李神峰 2024-06-14 10:20:49 +08:00
parent 25c2616e7e c4b6346aa2
commit 1d157906f4
12 changed files with 83 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/hdDetail/hdDetail.vue
View File

@ -69,6 +69,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.rain-detail-box{ .rain-detail-box{
height: 100vh;
overflow: hidden;
position: relative; position: relative;
.nav-bar{ .nav-bar{
display: flex; display: flex;

11
pages/hdDetail/jcsj/jcsjTable.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="table_div"> <div class="table_div">
<div class="table_cur"> <div class="table_cur">
<table> <table style="width:100%;display:block">
<tr> <tr>
<th style="width: 40px;"> <th style="width: 40px;">
序号 序号
@ -20,7 +20,8 @@
</view> </view>
</th> </th>
</tr> </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"> <tr v-for="(item, index) in newList" :key="index">
<td style="width: 30px">{{ index + 1 }}</td> <td style="width: 30px">{{ index + 1 }}</td>
<td style="width: 80px;">{{ item.tm }}</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: 100px">{{ item.z ? item.z.toFixed(2) : "-" }}</td>
<td style="width: 80px">{{ item.tq ? item.tq : "-" }}</td> <td style="width: 80px">{{ item.tq ? item.tq : "-" }}</td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
@ -72,6 +74,11 @@
empty-cells: show; empty-cells: show;
border-collapse: collapse; border-collapse: collapse;
font-size: 14px; font-size: 14px;
}
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
} }
.table_cur tr { .table_cur tr {
display: flex; display: flex;

4
pages/homeIndex/index.vue
View File

@ -76,9 +76,9 @@
}}</span }}</span
>mm， >mm，
<template v-if="list.data.cntDrp10 != 0" <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 list.data.cntDrp10
}}</apan }}</span
>个。</template >个。</template
><template v-if="list.data.cntDrp25 != 0" ><template v-if="list.data.cntDrp25 != 0"
><span class="b1">10mm至25mm</span>以下测站数为<span class="ye">{{ ><span class="b1">10mm至25mm</span>以下测站数为<span class="ye">{{

12
pages/rain/Table.vue
View File

@ -19,7 +19,8 @@
<th style="width: 22%"> <th style="width: 22%">
<div style="margin-top: 6px;">所属政区</div></th> <div style="margin-top: 6px;">所属政区</div></th>
</tr> </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%"> <tr v-for="(item, index) in list" :key="index" style="width:100%">
<td style="width: 11%;">{{ index + 1 }}</td> <td style="width: 11%;">{{ index + 1 }}</td>
<td style="width: 27%; color: #3399ef; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)"> <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: 20%">{{ item.yesDrp || 0 }}</td>
<td style="width:23%;">{{ item.adnm }}</td> <td style="width:23%;">{{ item.adnm }}</td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
</div> </div>
@ -68,6 +71,7 @@
flex: 1; flex: 1;
padding-top: 0px; padding-top: 0px;
overflow-x: scroll; overflow-x: scroll;
padding: 0 10px;
} }
/*table样式*/ /*table样式*/
.table_cur { .table_cur {
@ -91,7 +95,11 @@
white-space: nowrap; white-space: nowrap;
text-align: center !important; text-align: center !important;
} }
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
}
.table_cur td { .table_cur td {
height: 65rpx; height: 65rpx;
// border-bottom: 1px solid #d8ddeb; // border-bottom: 1px solid #d8ddeb;

7
pages/rain/rain.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="rain-box" style="overflow:hidden"> <view class="rain-box" style="overflow:hidden;height:100vh">
<u-status-bar></u-status-bar> <u-status-bar ></u-status-bar>
<!-- <view style="height: var(--status-bar-height); width: 100%;"></view> --> <!-- <view style="height: var(--status-bar-height); width: 100%;"></view> -->
<view class="nav-bar"> <view class="nav-bar">
<u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon> <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"), // 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") // 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:{ components:{

13
pages/rainDetail/jcsj/jcsjTable.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="table_div"> <div class="table_div">
<div class="table_cur"> <div class="table_cur">
<table> <table style="width:100%;display:block">
<tr> <tr>
<th style="width: 50px;"> <th style="width: 50px;">
序号 序号
@ -11,12 +11,14 @@
小时雨量(mm) 小时雨量(mm)
</th> </th>
</tr> </tr>
<div style="max-height: 320px; overflow-y: auto"> <!-- style="max-height: 320px; overflow-y: auto" -->
<tr v-for="(item, index) in tableData" :key="index"> <div class="scroll-table">
<tr v-for="(item, index) in tableData" :key="index">
<td style="width: 50px">{{ index + 1 }}</td> <td style="width: 50px">{{ index + 1 }}</td>
<td style="width: 200px;">{{ item.time }}</td> <td style="width: 200px;">{{ item.time }}</td>
<td style="width: 150px">{{ item.sumDrp }}</td> <td style="width: 150px">{{ item.sumDrp }}</td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
@ -69,6 +71,11 @@
white-space: nowrap; white-space: nowrap;
text-align: center !important; text-align: center !important;
} }
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
}
.table_cur td { .table_cur td {
height: 65rpx; height: 65rpx;

2
pages/rainDetail/rainDetail.vue
View File

@ -57,6 +57,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.rain-detail-box{ .rain-detail-box{
height: 100vh;
overflow: hidden;
.nav-bar{ .nav-bar{
display: flex; display: flex;
justify-content: center; justify-content: center;

11
pages/skDetail/jcsj/jcsjTable.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="table_div"> <div class="table_div">
<div class="table_cur"> <div class="table_cur">
<table> <table style="width:100%;display:block">
<tr> <tr>
<th style="width: 40px;"> <th style="width: 40px;">
序号 序号
@ -20,7 +20,8 @@
</view> </view>
</th> </th>
</tr> </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"> <tr v-for="(item, index) in newList" :key="index">
<td style="width: 30px">{{ index + 1 }}</td> <td style="width: 30px">{{ index + 1 }}</td>
<td style="width: 80px;">{{ item.tm }}</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: 100px">{{ item.rz ? item.rz.toFixed(2) : "-" }}</td>
<td style="width: 80px">{{ item.w ? item.w : "-" }}</td> <td style="width: 80px">{{ item.w ? item.w : "-" }}</td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
@ -72,6 +74,11 @@
empty-cells: show; empty-cells: show;
border-collapse: collapse; border-collapse: collapse;
font-size: 14px; font-size: 14px;
}
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
} }
.table_cur tr { .table_cur tr {
display: flex; display: flex;

16
pages/skDetail/skDetail.vue
View File

@ -11,27 +11,29 @@
<uni-swiper-dot :info="Array(2).fill(0)" :current="current" field="content" :dotsStyles="dotsStyles"> <uni-swiper-dot :info="Array(2).fill(0)" :current="current" field="content" :dotsStyles="dotsStyles">
<swiper class="swiper-box" style="height: 30px;" @change="change"> <swiper class="swiper-box" style="height: 30px;" @change="change">
<swiper-item > <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 class="jcsj" @click="activeOne = 0" :class="{'active':activeOne == 0}">
监测数据 监测数据
</view> </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>
<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>
<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>
</view> </view>
</swiper-item> </swiper-item>
<swiper-item > <swiper-item >
<view style="display: flex;"> <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>
<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>
</view> </view>
@ -113,6 +115,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.rain-detail-box{ .rain-detail-box{
height: 100vh;
overflow: hidden;
position: relative; position: relative;
.nav-bar{ .nav-bar{
display: flex; display: flex;

13
pages/water/hdWater/table.vue
View File

@ -8,14 +8,14 @@
</th> </th>
<th style="width: 32%"> <th style="width: 32%">
站名 站名
<th style="width: 32%;"> <th style="width: 31%;">
监测时间 监测时间
</th> </th>
<th style="width: 25%;" > <th style="width: 26%;" >
实时水位(m) 实时水位(m)
</th> </th>
</tr> </tr>
<div :style="{'max-height':height + 'px', 'overflow-y': 'auto'}"> <div class="scroll-table">
<tr v-for="(item, index) in newList" :key="index"> <tr v-for="(item, index) in newList" :key="index">
<td style="width: 11%">{{ index + 1 }}</td> <td style="width: 11%">{{ index + 1 }}</td>
<td style="width: 32%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</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> top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text>
</td> </td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
@ -74,6 +75,7 @@
flex: 1; flex: 1;
padding-top: 0px; padding-top: 0px;
overflow-x: scroll; overflow-x: scroll;
padding: 0 10px;
} }
/*table样式*/ /*table样式*/
.table_cur { .table_cur {
@ -86,6 +88,11 @@
display: flex; display: flex;
line-height: 80rpx; line-height: 80rpx;
} }
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
}
.table_cur th { .table_cur th {
height: 80rpx; height: 80rpx;
color: #3399ef; color: #3399ef;

20
pages/water/skWater/table.vue
View File

@ -6,7 +6,7 @@
<th style="width: 11%;"> <th style="width: 11%;">
序号 序号
</th> </th>
<th style="width: 24%"> <th style="width: 22%">
站名 站名
<th style="width: 22%;"> <th style="width: 22%;">
监测时间 监测时间
@ -14,14 +14,14 @@
<th style="width: 25%;" > <th style="width: 25%;" >
实时水位(m) 实时水位(m)
</th> </th>
<th style="width: 20%;" > <th style="width: 22%;" >
超汛限(m) 超汛限(m)
</th> </th>
</tr> </tr>
<div :style="{'max-height':height + 'px', 'overflow-y': 'auto'}"> <div class="scroll-table">
<tr v-for="(item, index) in newList" :key="index"> <tr v-for="(item, index) in newList" :key="index">
<td style="width: 11%">{{ index + 1 }}</td> <td style="width: 10%">{{ index + 1 }}</td>
<td style="width: 24%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td> <td style="width: 23%;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
<td style="width: 22%">{{item.tm}}</td> <td style="width: 22%">{{item.tm}}</td>
<td style="width: 25%; position: relative;" > <td style="width: 25%; position: relative;" >
<text :class="{'active1':item.flState == 1,'active2':item.desState == 1,'active3':item.calState}">{{ item.rz.toFixed(2) }}</text> <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; <text v-else-if="item.state == 2" style="position: absolute;
top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text> top:0px;right: 0; color: #32E48E; font-size: 18px;">↓</text>
</td> </td>
<td style="width: 20%">{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}</td> <td style="width: 22%">{{item.afsltdz ? item.afsltdz.toFixed(2):'-'}}</td>
</tr> </tr>
<div style="height:125px"></div>
</div> </div>
</table> </table>
</div> </div>
@ -79,6 +80,8 @@
flex: 1; flex: 1;
padding-top: 0px; padding-top: 0px;
overflow-x: scroll; overflow-x: scroll;
padding: 0 10px;
} }
/*table样式*/ /*table样式*/
.table_cur { .table_cur {
@ -91,6 +94,11 @@
display: flex; display: flex;
line-height: 80rpx; line-height: 80rpx;
} }
.scroll-table{
height: calc(100vh - 125px);
overflow-y: auto;
width:'100%'
}
.table_cur th { .table_cur th {
height: 80rpx; height: 80rpx;
color: #3399ef; color: #3399ef;

3
pages/water/water.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="water-box"> <view class="water-box" style="overflow:hidden;height:100vh">
<u-status-bar></u-status-bar> <u-status-bar></u-status-bar>
<view class="nav-bar"> <view class="nav-bar">
<u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon> <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
@ -43,7 +43,6 @@
} }
}, },
onReady(){ onReady(){
console.log(123333);
let that = this let that = this
uni.getSystemInfo({ uni.getSystemInfo({
success: (res) => { success: (res) => {