fix(): bug修复

master
李神峰 2024-11-14 17:54:35 +08:00
parent 6e12dbbf8b
commit afb768073c
23 changed files with 90 additions and 68 deletions

View File

@ -27,6 +27,7 @@
"distribute" : { "distribute" : {
/* */ /* */
"android" : { "android" : {
"packagename" : "com.gunshi.xytSk-App",
/* android */ /* android */
"permissions" : [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",

View File

@ -16,11 +16,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>
@ -34,7 +34,7 @@
<u-button @click="sx" class="aqjc-custom-style">-</u-button> <u-button @click="sx" class="aqjc-custom-style">-</u-button>
</view> </view>
<view class="play-btn"> <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> </view>
<view class="jcsj-charts"> <view class="jcsj-charts">

View File

@ -11,8 +11,8 @@
<div class="scroll-table"> <div class="scroll-table">
<tr v-for="(item, index) in data" :key="index"> <tr v-for="(item, index) in data" :key="index">
<td style="width:100px;text-align:center">{{ index + 1 }}</td> <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:200px;text-align:center">{{ item.tm }}</td>
<td style="width:100px;white-space:pre-wrap;text-align:center">{{ item.rz }}</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;"> <td v-for="(col,i) in newCol" :key="i" style="width:100px;text-align:center;">
{{item[col.key] }} {{item[col.key] }}
</td> </td>

View File

@ -3,11 +3,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -333,7 +333,7 @@
.navIcon { .navIcon {
position: relative; position: relative;
width: 84px; width: 80px;
height: 50px; height: 50px;
} }

View File

@ -12,11 +12,11 @@
<view class="time-ranger" style="padding:10px;background-color: #fff;"> <view class="time-ranger" style="padding:10px;background-color: #fff;">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchTm">
搜索 搜索
</view> </view>

View File

@ -11,11 +11,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchTm">
搜索 搜索
</view> </view>

View File

@ -9,11 +9,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchTm">
搜索 搜索
</view> </view>

View File

@ -9,11 +9,11 @@
<view class="time-ranger" > <view class="time-ranger" >
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -3,11 +3,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -3,11 +3,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -21,7 +21,7 @@
<view > <view >
<tr> <tr>
<td style="width: 50px">{{info.personName}}</td> <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: 80px">{{info.position}}</td>
<td style="width: 100px;color: #62bafa;" @click="show = true">{{info.tel}}</td> <td style="width: 100px;color: #62bafa;" @click="show = true">{{info.tel}}</td>
</tr> </tr>
@ -102,7 +102,7 @@
.zrtx-box{ .zrtx-box{
border: 1px solid #c1f2ce; border: 1px solid #c1f2ce;
border-radius: 2px; border-radius: 2px;
padding:10px 10px 5px 10px; padding:10px 5px 12px 5px;
background-color: #ebfbef; background-color: #ebfbef;
margin-bottom: 10px; margin-bottom: 10px;
.table_div { .table_div {
@ -128,7 +128,7 @@
} }
.table_cur tr { .table_cur tr {
display: flex; display: flex;
line-height: 65rpx; // line-height: 65rpx;
} }
.table_cur th { .table_cur th {
height: 65rpx; height: 65rpx;

View File

@ -7,11 +7,11 @@
</view> </view>
</view> </view>
<view class="project-des" > <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 style="display:flex;align-items:center;margin:15px 0px;">
<view class="circle-dot"></view> <view class="circle-dot"></view>
<view class="label-name"> <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> <text>{{item.value||"-"}}</text>
</view> </view>
</view> </view>
@ -118,27 +118,31 @@ export default {
padding: 5px; padding: 5px;
margin: 5px 0; margin: 5px 0;
} }
.project-des{ .project-des {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
border: 1px solid #f2f2f2; border: 1px solid #f2f2f2;
background-color: #ffffff; background-color: #ffffff;
padding: 0 10px; padding: 0 10px;
.circle-dot{ max-height: calc(100vh - 190px);
width: 10px; overflow: auto;
height: 10px;
border-radius: 50%; .circle-dot {
background-color: #409eff; width: 10px;
margin-left: 10px; height: 10px;
} border-radius: 50%;
.label-name{ background-color: #409eff;
display: flex; margin-left: 10px;
flex-direction: column;
align-items: center;
flex:1
}
} }
.label-name {
display: flex;
flex-direction: column;
align-items: center;
flex: 1
}
}
} }
.total-des{ .total-des{
margin-top: 10px; margin-top: 10px;

View File

@ -16,7 +16,7 @@
<text>水位</text> <text>水位</text>
</view> </view>
<view class="first-item"> <view class="first-item">
<text>{{info.nowCap}}</text> <text>{{info.nowCap}}万m³</text>
<text>蓄水量</text> <text>蓄水量</text>
</view> </view>
<view class="first-line"></view> <view class="first-line"></view>
@ -28,7 +28,7 @@
<view class="first-extra-row"> <view class="first-extra-row">
<text>坝顶高程{{info.crestElev}}</text> <text>坝顶高程{{info.crestElev}}</text>
<text>汛限水位{{info.flLowLimLev}}</text> <text>汛限水位{{info.flLowLimLev}}</text>
<text>总库容{{info.totCap}}</text> <text>总库容{{info.totCap}}万m³</text>
</view> </view>
<view class="sk-second-row"> <view class="sk-second-row">
<view class="first-item"> <view class="first-item">
@ -55,11 +55,11 @@
<view class="time-ranger" > <view class="time-ranger" >
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -28,7 +28,9 @@ export default {
async getKrData(){ async getKrData(){
try { try {
const {data} = await uni.$http.post( const {data} = await uni.$http.post(
"/gunshiApp/xyt/stZvarlB/list") "/gunshiApp/xyt/stZvarlB/list",{
stcd:"716164061"
})
if(data.code == 200){ if(data.code == 200){
this.tableData = [...data.data]; this.tableData = [...data.data];

View File

@ -1,6 +1,6 @@
<template > <template >
<view class="project-des" > <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 style="display:flex;align-items:center;margin:15px 0px;">
<view class="circle-dot"></view> <view class="circle-dot"></view>
<view class="label-name"> <view class="label-name">

View File

@ -8,11 +8,11 @@
<view class="time-ranger" style="margin-top:70px"> <view class="time-ranger" style="margin-top:70px">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -70,7 +70,7 @@ export default function drpOption (obj) {
{ {
type: 'category', type: 'category',
data: data.map(o => o.tm), data: data.map(o => o.tm),
// inverse: true, inverse: true,
splitLine: { splitLine: {
show: false show: false
}, },

View File

@ -18,11 +18,11 @@
<view class="time-ranger" > <view class="time-ranger" >
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>
@ -31,7 +31,7 @@
</view> </view>
<view class="jcsj-content"> <view class="jcsj-content" v-if="tableData.length != 0">
<view class="jcsj-charts" > <view class="jcsj-charts" >
<qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" /> <qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
</view> </view>
@ -39,6 +39,11 @@
<JcsjTable :tableData="tableData" /> <JcsjTable :tableData="tableData" />
</view> </view>
</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 <u-datetime-picker
:show="showTime" :show="showTime"
v-model="startTime" v-model="startTime"
@ -61,7 +66,7 @@
import moment from "moment" import moment from "moment"
import JcsjTable from "./jcsjTable" import JcsjTable from "./jcsjTable"
import drpOption from "./chartOption.js" 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"); const etm = moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm");
export default { export default {
props:{ props:{

View File

@ -10,11 +10,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchTm">
搜索 搜索
</view> </view>

View File

@ -9,11 +9,11 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>

View File

@ -16,23 +16,31 @@
<view class="time-ranger"> <view class="time-ranger">
<view class="start-time"> <view class="start-time">
<text>开始时间</text> <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>
<view class="end-time"> <view class="end-time">
<text>结束时间</text> <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 class="search-btn" @click="searchHandle">
搜索 搜索
</view> </view>
</view> </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" /> <qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
</view> </view>
<view class="ylz-table-area"> <view class="ylz-table-area">
<YlzTable :tableData="ylzData"></YlzTable> <YlzTable :tableData="ylzData"></YlzTable>
</view> </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>
<view v-if="activeOne == 1" style="padding:10px"> <view v-if="activeOne == 1" style="padding:10px">
<Table></Table> <Table></Table>
@ -74,6 +82,7 @@
chartData1: {}, chartData1: {},
chartData: {}, chartData: {},
stnm:'', stnm:'',
stcd:''
} }
}, },
methods: { methods: {
@ -85,7 +94,7 @@
data data
} = await uni.$http.post( } = await uni.$http.post(
"/gunshiApp/xyt/attResBase/rainBasinDivision/queryStStbprpPerHour/StcdAndStartTimeAndEndTime", { "/gunshiApp/xyt/attResBase/rainBasinDivision/queryStStbprpPerHour/StcdAndStartTimeAndEndTime", {
stcd: "716164061", stcd: this.stcd,
startTime: moment(this.stm).format("YYYY-MM-DD HH:mm:ss"), startTime: moment(this.stm).format("YYYY-MM-DD HH:mm:ss"),
endTime: moment(this.etm).format("YYYY-MM-DD HH:mm:ss") endTime: moment(this.etm).format("YYYY-MM-DD HH:mm:ss")
}) })
@ -142,7 +151,8 @@
} }
}, },
onLoad(options){ onLoad(options){
this.stnm = options.stnm this.stnm = options.stnm;
this.stcd = options.stcd;
}, },
mounted() { mounted() {
this.getrainInfo(); this.getrainInfo();

View File

@ -62,7 +62,7 @@
toDetail(){ toDetail(){
uni.navigateTo({ uni.navigateTo({
url:`/pages/ylzList/detail/index?stnm=${this.item.stnm}` url:`/pages/ylzList/detail/index?stnm=${this.item.stnm}&stcd=${this.item.stcd}`
}) })
}, },
}, },