Compare commits

..

No commits in common. "cfff30a0a557e81b43efb908e339972989e1ad6c" and "c80d6b8ab22c906700dfc1072eb9bc0841b4f018" have entirely different histories.

6 changed files with 6 additions and 30 deletions

View File

@ -692,10 +692,6 @@ textarea {
border-right: 1px solid rgba(2, 148, 226, 0.5); border-right: 1px solid rgba(2, 148, 226, 0.5);
} }
.input-main-200 input {
width: 200px !important;
}
.input-main span { .input-main span {
padding: 0 10px; padding: 0 10px;
} }
@ -816,10 +812,6 @@ textarea {
color: #859BB6; color: #859BB6;
} }
.input-main-60 input.w-100 {
width: 100px;
}
.input-main-one { .input-main-one {
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;

View File

@ -716,11 +716,7 @@ textarea{
.border-right { .border-right {
border-right: 1px solid rgba(2, 148, 226, 0.5); border-right: 1px solid rgba(2, 148, 226, 0.5);
} }
.input-main-200{
input{
width: 200px!important;
}
}
.input-main { .input-main {
span { span {
padding: 0 10px; padding: 0 10px;
@ -852,9 +848,6 @@ textarea{
&::placeholder { &::placeholder {
color: #859BB6; color: #859BB6;
} }
&.w-100{
width: 100px;
}
} }
} }

View File

@ -140,13 +140,6 @@
<img src="../../assets/image/rotate.png" alt="" />轮模式启用 <img src="../../assets/image/rotate.png" alt="" />轮模式启用
</div> --> </div> -->
</div> </div>
<div class="flex-view">
<div class="input-main-60">
<span>本灌溉组启动追随阀</span>
<input @blur="blurChange('1' + (10 + (indexs - 1)) + '73', $event)" v-model="inputData['1' + (10 + (indexs - 1)) + '73']"
@input="change('1' + (10 + (indexs - 1)) + '73', $event)" type="number" placeholder="0" />
</div>
</div>
<div class="flex-view"> <div class="flex-view">
<!-- <div @click="(open1 = !open1), change59()" class="open-btn" :class="open1 ? 'active' : ''"> <!-- <div @click="(open1 = !open1), change59()" class="open-btn" :class="open1 ? 'active' : ''">
<img v-if="!open1" src="../../assets/image/irrigateSet-icon1.png" alt="" /> <img v-if="!open1" src="../../assets/image/irrigateSet-icon1.png" alt="" />

View File

@ -1508,11 +1508,9 @@ export default {
}, },
chart_fidata(equipmentId){ chart_fidata(equipmentId){
var store = this.$store.state
this.api.chart_fidata(equipmentId).then(res=>{ this.api.chart_fidata(equipmentId).then(res=>{
if (res.data.code == 200) { if (res.data.code == 200) {
var chartsData = res.data.data var chartsData = res.data.data
var data1 = store.equipmentList[this.indexs - 1].deviceId
realTimeLine('realTime-line', chartsData, data1) realTimeLine('realTime-line', chartsData, data1)
} else { } else {
// this.$message.error(res.data.msg); // this.$message.error(res.data.msg);

View File

@ -6,9 +6,9 @@
</div> </div>
<div class="flex-view"> <div class="flex-view">
<div class="input-main-60"> <div class="input-main-60">
<template v-for="item, index in dataInfo2_list" > <template v-for="item, index in dataInfo2_list">
<span>{{ item.title }}</span> <span>{{ item.title }}</span>
<input :class="index==2?'w-100':''" v-model="item.timer" type="text" value="60" disabled placeholder="60" /> <input v-model="item.timer" type="text" value="60" disabled placeholder="60" />
<span>{{ item.unit }}</span> <span>{{ item.unit }}</span>
</template> </template>
</div> </div>

View File

@ -11,13 +11,13 @@
<img src="../../assets/image/system.png" alt=""> 系统参数设置 <img src="../../assets/image/system.png" alt=""> 系统参数设置
</div> </div>
<div class="flex-view border-none padding-none"> <div class="flex-view border-none padding-none">
<div class="input-main-60 input-main-100" style="width: auto;"> <div class="input-main-60" style="width: auto;">
<span>软件版本号</span> <span>软件版本号</span>
<input disabled v-model="inputData['3039']" type="text" placeholder="0"> <input disabled v-model="inputData['3039']" type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main-60 input-main-200" style="width: auto;"> <div class="input-main">
<span>智能灌溉控制器</span> <span>智能灌溉控制器</span>
<input disabled v-model="inputData['3040']" type="text" placeholder="0"> <input disabled v-model="inputData['3040']" type="text" placeholder="0">
<span></span> <span></span>