xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #12

Merged
clibing merged 5 commits from pc-master into portal 2023-10-13 02:43:37 +00:00
Conversation 0 Commits 5 Files Changed 23 +24 -6
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a79e8028a - Show all commits

25
src/views/page/formula.vue
View File

@ -3,7 +3,7 @@
<set-params></set-params>
<div class="page-content">
<div class="table-title">
<img src="../../assets/image/formula.png" alt=""> 施肥配方参数{{indexs}} <div class="tips">{{ titleName }}</div>
<img src="../../assets/image/formula.png" alt=""> {{ titleName }}参数 <div class="tips">种植作物配方1</div>
</div>
<div class="input-view">
<div class="input-sel">
@ -21,13 +21,13 @@
</div>
<div class="input-main">
<span>目标PH值</span>
<input @blur="blurChange(store.formulaNum[indexs - 1], $event)"
<input @blur="blurChangeCount(store.formulaNum[indexs - 1], $event)"
v-model="inputData[store.formulaNum[indexs - 1]]"
@input="changeCount(store.formulaNum[indexs - 1], $event)" type="number" placeholder="0.0">
</div>
<div class="input-main">
<span>目标EC值</span>
<input @blur="blurChange(store.formulaNum[indexs - 1] + 1, $event)"
<input @blur="blurChangeCount(store.formulaNum[indexs - 1] + 1, $event)"
v-model="inputData[store.formulaNum[indexs - 1] + 1]"
@input="changeCount(store.formulaNum[indexs - 1] + 1, $event)" type="number" placeholder="0.0">
</div>
@ -65,7 +65,7 @@
<div class="type0" v-if="scope.row.type == 0">
<div class="input-main-80 table-input">
<span> {{ scope.row.data3 }}</span>
<input @blur="blurChange(store.formulaNum[indexs - 1] + 24 + scope.$index, $event)"
<input @blur="blurChangeCount(store.formulaNum[indexs - 1] + 24 + scope.$index, $event)"
v-model="inputData[store.formulaNum[indexs - 1] + 24]"
@input="changeCount(store.formulaNum[indexs - 1] + 24, $event)" type="number" style="height: 34px;"
placeholder="0.0">
@ -74,7 +74,7 @@
<div class="type0" v-if="scope.row.type == 1">
<div class="input-main-80 table-input">
<span> {{ scope.row.data3 }}</span>
<input @blur="blurChange(store.formulaNum[indexs - 1] + 25 + scope.$index, $event)"
<input @blur="blurChangeCount(store.formulaNum[indexs - 1] + 25 + scope.$index, $event)"
v-model="inputData[store.formulaNum[indexs - 1] + 25]"
@input="changeCount(store.formulaNum[indexs - 1] + 25, $event)" type="number" style="height: 34px;"
placeholder="0.0">
@ -294,7 +294,22 @@ export default {
value: el.target.value * 10
}
};
console.log(data,11);
this.change(code, data)
},
//失去焦点
blurChangeCount(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);
}
},
//计算数据 /10
countData1(data) {

5
src/views/page/upload.vue
View File

@ -120,6 +120,7 @@ export default {
this.actList2.push(this.actList2New.length-index-1)
}
})
console.log(this.actList2);
},
dataInit() {
this.actList1New = []
@ -235,6 +236,7 @@ selectValue(e) {
} else {
this.actList1.splice(this.actList1.indexOf(index), 1)
}
this.actList1New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',]
this.actList1.forEach((el, index) => {
this.actList1New[this.actList1New.length-el-1] = '1'
})
@ -253,10 +255,11 @@ selectValue(e) {
} else {
this.actList2.splice(this.actList2.indexOf(index), 1)
}
this.actList2New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',]
this.actList2.forEach((el, index) => {
this.actList2New[this.actList2New.length-el-1] = '1'
})
console.log(this.actList2,this.actList2New,this.actList2New.join(""));
var num = this.actList2New.join("");
var dataNum = {
target: {