1
This commit is contained in:
parent
40e301104d
commit
19ff93418f
@ -222,7 +222,7 @@
|
|||||||
<image src="../../static/closed.png" mode="" @click="closePop"></image>
|
<image src="../../static/closed.png" mode="" @click="closePop"></image>
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
<u-popup v-model="Soilshow" mode="center" :mask-close-able='false' width="640rpx"
|
<u-popup v-model="Soilshow" :mask-close-able="true" height="800rpx" mode="center" width="640rpx"
|
||||||
:closeable='false'>
|
:closeable='false'>
|
||||||
<view class="contentPop soil-pop" style="padding-bottom: 70rpx;">
|
<view class="contentPop soil-pop" style="padding-bottom: 70rpx;">
|
||||||
<view class="contentPop_box" >
|
<view class="contentPop_box" >
|
||||||
@ -230,14 +230,14 @@
|
|||||||
土壤温湿度传感器数据
|
土壤温湿度传感器数据
|
||||||
</view>
|
</view>
|
||||||
<view class="soil-flex" v-if="inputData[3102]!=0">
|
<view class="soil-flex" v-if="inputData[3102]!=0">
|
||||||
<view class="left">
|
<view class="left" >
|
||||||
<template v-for="item,index in 40">
|
<template v-for="item,index in 40">
|
||||||
<view class="irrigate_input" v-if="index<(inputData[3102]?inputData[3102]:0)" :key="index">
|
<view class="irrigate_input" v-if="index<(inputData[3102]?inputData[3102]:0)" :key="index">
|
||||||
<view class="number">{{index+1}}#温度</view> <input :value="inputData[3103+index]?(inputData[3103+index]-400)/10:0" disabled type="number" placeholder="0" />℃
|
<view class="number">{{index+1}}#温度</view> <input :value="inputData[3103+index]?(inputData[3103+index]-400)/10:0" disabled type="number" placeholder="0" />℃
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
</view>
|
</view>
|
||||||
<view class="right">
|
<view class="right" >
|
||||||
<template v-for="item,index in 40">
|
<template v-for="item,index in 40">
|
||||||
<view class="irrigate_input" v-if="index<(inputData[3102]?inputData[3102]:0)" :key="index">
|
<view class="irrigate_input" v-if="index<(inputData[3102]?inputData[3102]:0)" :key="index">
|
||||||
<view class="number">{{index+1}}#湿度</view> <input :value="inputData[3062+index]?inputData[3062+index]/10:0" disabled type="number" placeholder="0" />%RH
|
<view class="number">{{index+1}}#湿度</view> <input :value="inputData[3062+index]?inputData[3062+index]/10:0" disabled type="number" placeholder="0" />%RH
|
||||||
@ -300,9 +300,9 @@
|
|||||||
</view>
|
</view>
|
||||||
-->
|
-->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<image src="../../static/closed.png" mode="" @click="Soilshow=false"></image>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</u-popup>
|
</u-popup>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -887,6 +887,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
.fertilizer_machine {
|
.fertilizer_machine {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
@ -1327,6 +1328,7 @@
|
|||||||
// min-height: calc(100% - 70rpx);
|
// min-height: calc(100% - 70rpx);
|
||||||
height:calc(100% - 70rpx);
|
height:calc(100% - 70rpx);
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
&.soil-pop{
|
&.soil-pop{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
>image {
|
>image {
|
||||||
@ -1360,18 +1362,18 @@
|
|||||||
line-height: 91rpx;
|
line-height: 91rpx;
|
||||||
}
|
}
|
||||||
.soil-flex{
|
.soil-flex{
|
||||||
max-height: 700rpx;
|
// max-height: 700rpx;
|
||||||
overflow: auto;
|
// overflow-y: auto;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
.left,.right{
|
.left,.right{
|
||||||
width: 50%;
|
width: 50%;
|
||||||
flex-shrink: 0;
|
|
||||||
|
// flex-shrink: 0;
|
||||||
>view{
|
>view{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
flex-shrink: 0;
|
// flex-shrink: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user