fix(): bug修复
parent
6e12dbbf8b
commit
afb768073c
|
|
@ -27,6 +27,7 @@
|
|||
"distribute" : {
|
||||
/* 应用发布信息 */
|
||||
"android" : {
|
||||
"packagename" : "com.gunshi.xytSk-App",
|
||||
/* android打包配置 */
|
||||
"permissions" : [
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<u-button @click="sx" class="aqjc-custom-style">-</u-button>
|
||||
</view>
|
||||
<view class="play-btn">
|
||||
<uni-icons type="videocam" size="40" @click="play"></uni-icons>
|
||||
<uni-icons type="videocam" size="40" :color="swiper ? '#2979ff':'#909399' " @click="play"></uni-icons>
|
||||
</view>
|
||||
</view>
|
||||
<view class="jcsj-charts">
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
<div class="scroll-table">
|
||||
<tr v-for="(item, index) in data" :key="index">
|
||||
<td style="width:100px;text-align:center">{{ index + 1 }}</td>
|
||||
<td style="width:200px;white-space:pre-wrap;text-align:center">{{ item.tm }}</td>
|
||||
<td style="width:100px;white-space:pre-wrap;text-align:center">{{ item.rz }}</td>
|
||||
<td style="width:200px;text-align:center">{{ item.tm }}</td>
|
||||
<td style="width:100px;text-align:center">{{ item.rz }}</td>
|
||||
<td v-for="(col,i) in newCol" :key="i" style="width:100px;text-align:center;">
|
||||
{{item[col.key] }}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@
|
|||
|
||||
.navIcon {
|
||||
position: relative;
|
||||
width: 84px;
|
||||
width: 80px;
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
<view class="time-ranger" style="padding:10px;background-color: #fff;">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{startTime}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{startTime}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{endTime}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{endTime}}</text>
|
||||
<view class="search-btn" @click="searchTm">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{startTime}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{startTime}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{endTime}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{endTime}}</text>
|
||||
<view class="search-btn" @click="searchTm">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{startTime}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{startTime}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{endTime}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{endTime}}</text>
|
||||
<view class="search-btn" @click="searchTm">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
<view class="time-ranger" >
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<view >
|
||||
<tr>
|
||||
<td style="width: 50px">{{info.personName}}</td>
|
||||
<td style="width: 130px;">{{info.orgName}}</td>
|
||||
<td style="width: 130px;white-space: pre-wrap;">{{info.orgName}}</td>
|
||||
<td style="width: 80px">{{info.position}}</td>
|
||||
<td style="width: 100px;color: #62bafa;" @click="show = true">{{info.tel}}</td>
|
||||
</tr>
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
.zrtx-box{
|
||||
border: 1px solid #c1f2ce;
|
||||
border-radius: 2px;
|
||||
padding:10px 10px 5px 10px;
|
||||
padding:10px 5px 12px 5px;
|
||||
background-color: #ebfbef;
|
||||
margin-bottom: 10px;
|
||||
.table_div {
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
}
|
||||
.table_cur tr {
|
||||
display: flex;
|
||||
line-height: 65rpx;
|
||||
// line-height: 65rpx;
|
||||
}
|
||||
.table_cur th {
|
||||
height: 65rpx;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="project-des" >
|
||||
<view v-for="(item,index) in tableData" :key="index" :style="index % 2 == 0 ? 'width:150px;':'width:197px;'">
|
||||
<view v-for="(item,index) in tableData" :key="index" :style="index % 2 == 0 ? 'width:50%;':'width:50%;'">
|
||||
<view style="display:flex;align-items:center;margin:15px 0px;">
|
||||
<view class="circle-dot"></view>
|
||||
<view class="label-name">
|
||||
<text style="opacity:0.5">{{item.name}}</text>
|
||||
<text style="opacity:0.5;text-align: center;">{{item.name}}</text>
|
||||
<text>{{item.value||"-"}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -118,27 +118,31 @@ export default {
|
|||
padding: 5px;
|
||||
margin: 5px 0;
|
||||
}
|
||||
.project-des{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
border: 1px solid #f2f2f2;
|
||||
background-color: #ffffff;
|
||||
padding: 0 10px;
|
||||
.circle-dot{
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
border-radius: 50%;
|
||||
background-color: #409eff;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.label-name{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
.project-des {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
border: 1px solid #f2f2f2;
|
||||
background-color: #ffffff;
|
||||
padding: 0 10px;
|
||||
max-height: calc(100vh - 190px);
|
||||
overflow: auto;
|
||||
|
||||
flex:1
|
||||
}
|
||||
.circle-dot {
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
border-radius: 50%;
|
||||
background-color: #409eff;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.label-name {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
flex: 1
|
||||
}
|
||||
}
|
||||
}
|
||||
.total-des{
|
||||
margin-top: 10px;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<text>水位</text>
|
||||
</view>
|
||||
<view class="first-item">
|
||||
<text>{{info.nowCap}}米</text>
|
||||
<text>{{info.nowCap}}万m³</text>
|
||||
<text>蓄水量</text>
|
||||
</view>
|
||||
<view class="first-line"></view>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<view class="first-extra-row">
|
||||
<text>坝顶高程{{info.crestElev}}米</text>
|
||||
<text>汛限水位{{info.flLowLimLev}}米</text>
|
||||
<text>总库容{{info.totCap}}米</text>
|
||||
<text>总库容{{info.totCap}}万m³</text>
|
||||
</view>
|
||||
<view class="sk-second-row">
|
||||
<view class="first-item">
|
||||
|
|
@ -55,11 +55,11 @@
|
|||
<view class="time-ranger" >
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,9 @@ export default {
|
|||
async getKrData(){
|
||||
try {
|
||||
const {data} = await uni.$http.post(
|
||||
"/gunshiApp/xyt/stZvarlB/list")
|
||||
"/gunshiApp/xyt/stZvarlB/list",{
|
||||
stcd:"716164061"
|
||||
})
|
||||
if(data.code == 200){
|
||||
this.tableData = [...data.data];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template >
|
||||
<view class="project-des" >
|
||||
<view v-for="(item,index) in tableData" :key="index" :style="index % 2 != 0 ? 'width:150px;':'width:197px;'">
|
||||
<view v-for="(item,index) in tableData" :key="index" :style="index % 2 == 0 ? 'width:50%;':'width:50%;'">
|
||||
<view style="display:flex;align-items:center;margin:15px 0px;">
|
||||
<view class="circle-dot"></view>
|
||||
<view class="label-name">
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<view class="time-ranger" style="margin-top:70px">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ export default function drpOption (obj) {
|
|||
{
|
||||
type: 'category',
|
||||
data: data.map(o => o.tm),
|
||||
// inverse: true,
|
||||
inverse: true,
|
||||
splitLine: {
|
||||
show: false
|
||||
},
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
<view class="time-ranger" >
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</view>
|
||||
|
||||
|
||||
<view class="jcsj-content">
|
||||
<view class="jcsj-content" v-if="tableData.length != 0">
|
||||
<view class="jcsj-charts" >
|
||||
<qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
|
||||
</view>
|
||||
|
|
@ -39,6 +39,11 @@
|
|||
<JcsjTable :tableData="tableData" />
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
style="height:calc(100vh - 160px);display: flex;align-items: center;justify-content: center;background-color: #fff;margin-top:10px"
|
||||
v-else>
|
||||
<image src="../../static/empty.png" mode=""></image>
|
||||
</view>
|
||||
<u-datetime-picker
|
||||
:show="showTime"
|
||||
v-model="startTime"
|
||||
|
|
@ -61,7 +66,7 @@
|
|||
import moment from "moment"
|
||||
import JcsjTable from "./jcsjTable"
|
||||
import drpOption from "./chartOption.js"
|
||||
const stm = moment().subtract(7, 'months').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm");
|
||||
const stm = moment().subtract(1, 'months').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm");
|
||||
const etm = moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm");
|
||||
export default {
|
||||
props:{
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{startTime}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{startTime}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{endTime}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{endTime}}</text>
|
||||
<view class="search-btn" @click="searchTm">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -16,23 +16,31 @@
|
|||
<view class="time-ranger">
|
||||
<view class="start-time">
|
||||
<text>开始时间</text>
|
||||
<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
|
||||
<text @click="showTime=true" style="margin-left:10%;color:#3399ef">{{stm}}</text>
|
||||
</view>
|
||||
<view class="end-time">
|
||||
<text>结束时间</text>
|
||||
<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
|
||||
<text @click="showTime1=true" style="margin:0 10%;color:#3399ef">{{etm}}</text>
|
||||
<view class="search-btn" @click="searchHandle">
|
||||
搜索
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="ylz-chart-area">
|
||||
<view v-if="ylzData.length != 0">
|
||||
<view class="ylz-chart-area">
|
||||
<qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
|
||||
</view>
|
||||
<view class="ylz-table-area">
|
||||
<YlzTable :tableData="ylzData"></YlzTable>
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
style="height:calc(100vh - 160px);display: flex;align-items: center;justify-content: center;background-color: #fff;margin-top:10px"
|
||||
v-else>
|
||||
<image src="../../../static/empty.png" mode=""></image>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view v-if="activeOne == 1" style="padding:10px">
|
||||
<Table></Table>
|
||||
|
|
@ -74,6 +82,7 @@
|
|||
chartData1: {},
|
||||
chartData: {},
|
||||
stnm:'',
|
||||
stcd:''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -85,7 +94,7 @@
|
|||
data
|
||||
} = await uni.$http.post(
|
||||
"/gunshiApp/xyt/attResBase/rainBasinDivision/queryStStbprpPerHour/StcdAndStartTimeAndEndTime", {
|
||||
stcd: "716164061",
|
||||
stcd: this.stcd,
|
||||
startTime: moment(this.stm).format("YYYY-MM-DD HH:mm:ss"),
|
||||
endTime: moment(this.etm).format("YYYY-MM-DD HH:mm:ss")
|
||||
})
|
||||
|
|
@ -142,7 +151,8 @@
|
|||
}
|
||||
},
|
||||
onLoad(options){
|
||||
this.stnm = options.stnm
|
||||
this.stnm = options.stnm;
|
||||
this.stcd = options.stcd;
|
||||
},
|
||||
mounted() {
|
||||
this.getrainInfo();
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
toDetail(){
|
||||
uni.navigateTo({
|
||||
url:`/pages/ylzList/detail/index?stnm=${this.item.stnm}`
|
||||
url:`/pages/ylzList/detail/index?stnm=${this.item.stnm}&stcd=${this.item.stcd}`
|
||||
})
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue