Merge pull request 'pc-master' (#15) from pc-master into portal

Reviewed-on: #15
pull/34/head^2
xiaomeng 2023-10-16 08:45:18 +00:00
commit c9f9155367
2 changed files with 41 additions and 25 deletions

View File

@ -102,7 +102,8 @@
<style lang="scss" scoped>
.login{
width: 100%;
height: 100vh;
height: 100%;
// min-height: 900px;
background: url(../assets/image/login-bg.png) no-repeat center;
background-size: cover;
background-position:center center;

View File

@ -26,7 +26,7 @@
</div>
<div class="input-main">
<span>手动启动时间</span>
<input @blur="blurChange(10 + (indexs - 1) + '01', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '01', $event)"
v-model="inputData[10 + (indexs - 1) + '01']"
@input="changeData10(10 + (indexs - 1) + '01', $event)"
type="text"
@ -92,7 +92,7 @@
<div class="flex-view">
<div class="input-main-80">
<span>施肥时采用</span>
<input @blur="blurChange(10 + (indexs - 1) + '53', $event)"
<input @blur="blurChange(10 + (indexs - 1) + '58', $event)"
v-model="inputData[10 + (indexs - 1) + '58']"
@input="change(10 + (indexs - 1) + '58', $event)"
type="number"
@ -213,12 +213,12 @@
<div class="input-view">
<div class="input-sel">
<span>施肥机自动运行模式选择</span>
<el-dropdown @command="handleCommand">
<div class="el-dropdown-link">
<el-dropdown trigger="click" @command="handleCommand">
<div class="el-dropdown-link">
<input
type="text"
disabled
value="选择设定弹窗"
v-model="data53"
class="input-input"
placeholder="无"
/>
@ -253,7 +253,7 @@
</div>
<div class="input-main-80">
<span>每次灌溉时长</span>
<input @blur="blurChange(10 + (indexs - 1) + '06', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '06', $event)"
v-model="inputData[10 + (indexs - 1) + '06']"
@input="changeData10(10 + (indexs - 1) + '06', $event)"
type="number"
@ -379,7 +379,7 @@
</div>
<div class="input-main-80">
<span>每次灌溉时长</span>
<input @blur="blurChange(10 + (indexs - 1) + '17', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '17', $event)"
v-model="inputData[10 + (indexs - 1) + '17']"
@input="changeData10(10 + (indexs - 1) + '17', $event)"
type="number"
@ -565,7 +565,7 @@
<div class="model1-content model3-content">
<div class="input-main-80">
<span class="text">启动时灌湛时长</span>
<input @blur="blurChange(10 + (indexs - 1) + '40', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '40', $event)"
v-model="inputData[10 + (indexs - 1) + '40']"
@input="changeData10(10 + (indexs - 1) + '40', $event)"
type="number"
@ -594,7 +594,7 @@
</div>
<div class="input-main-80">
<span class="text" style="padding-left: 20px">最短灌溉间隔</span>
<input @blur="blurChange(10 + (indexs - 1) + '43', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '43', $event)"
v-model="inputData[10 + (indexs - 1) + '43']"
@input="changeData10(10 + (indexs - 1) + '43', $event)"
type="number"
@ -603,7 +603,7 @@
</div>
<div class="input-main-80">
<span class="text">最长灌溉间隔</span>
<input @blur="blurChange(10 + (indexs - 1) + '44', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '44', $event)"
v-model="inputData[10 + (indexs - 1) + '44']"
@input="changeData10(10 + (indexs - 1) + '44', $event)"
type="number"
@ -687,7 +687,7 @@
</div>
<div class="input-main-80">
<span class="text">灌溉时长上限</span>
<input @blur="blurChange(10 + (indexs - 1) + '39', $event)"
<input @blur="blurChange10(10 + (indexs - 1) + '39', $event)"
v-model="inputData[10 + (indexs - 1) + '39']"
@input="changeData10(10 + (indexs - 1) + '39', $event)"
type="number"
@ -825,28 +825,29 @@ export default {
} else if (command == "5") {
this.model4 = true;
}
// this.inputData[10 + (this.indexs - 1) + "53"] = command;
// this.get53data(command)
// var data53={
// target: {
// value: this.inputData[10 + (this.indexs - 1) + "53"],
// },
// }
// this.change(10 + (this.indexs - 1) + "53", data53);
this.inputData[10 + (this.indexs - 1) + "53"] = command;
this.get53data(command)
var data53={
target: {
value: this.inputData[10 + (this.indexs - 1) + "53"],
},
}
this.changeBtn(10 + (this.indexs - 1) + "53", data53);
},
get53data(index) {
var data = index;
var text53 = "";
if (data == "1") {
text53 = "定时启动";
text53 = "定时间点启动";
} else if (data == "2") {
text53 = "间隔启动";
text53 = "预定时间段启动";
} else if (data == "3") {
text53 = "土壤传感器启动";
text53 = "依据土壤传感器";
} else if (data == "4") {
text53 = "光积累启动";
text53 = "依据光照传感器";
} else if (data == "5") {
text53 = "外控启动";
text53 = "依据外控信号";
}
this.data53 = text53;
},
@ -979,6 +980,20 @@ export default {
selectValue(e) {
e.currentTarget.select();
},
//
blurChange10(code, el) {
var store=this.$store.state
var data = {
equipmentId: store.equipmentList[store.equipmentIndex-1].deviceId,
regAddress: code,
num: el.target.value*10,
}; //
if(this.timer){
this.timer && clearInterval(this.timer);
this.changeData(data);
}
},
//
blurChange(code, el) {
var store=this.$store.state