Compare commits
No commits in common. "4915a0c1ce05871a06b442132aed9d88994c9936" and "5145383c044f10a7146b978cc795cf929db5caf8" have entirely different histories.
4915a0c1ce
...
5145383c04
|
|
@ -74,23 +74,6 @@ export default {
|
|||
sensorType: '',
|
||||
typeList1: [
|
||||
// { label: '平均1#土壤湿度', value: 0 },
|
||||
{ label: '1#土壤温度', value: 1 },
|
||||
{ label: '2#土壤温度', value: 2 },
|
||||
{ label: '3#土壤温度', value: 3 },
|
||||
{ label: '4#土壤温度', value: 4 },
|
||||
{ label: '5#土壤温度', value: 5 },
|
||||
{ label: '6#土壤温度', value: 6 },
|
||||
{ label: '7#土壤温度', value: 7 },
|
||||
{ label: '8#土壤温度', value: 8 },
|
||||
{ label: '9#土壤温度', value: 9 },
|
||||
{ label: '10#土壤温度', value: 10 },
|
||||
{ label: '11#土壤温度', value: 11 },
|
||||
{ label: '12#土壤温度', value: 12 },
|
||||
{ label: '13#土壤温度', value: 13 },
|
||||
{ label: '14#土壤温度', value: 14 },],
|
||||
list1:40,
|
||||
typeList2: [
|
||||
// { label: '平均1#土壤湿度', value: 0 },
|
||||
{ label: '1#土壤湿度', value: 1 },
|
||||
{ label: '2#土壤湿度', value: 2 },
|
||||
{ label: '3#土壤湿度', value: 3 },
|
||||
|
|
@ -105,6 +88,23 @@ export default {
|
|||
{ label: '12#土壤湿度', value: 12 },
|
||||
{ label: '13#土壤湿度', value: 13 },
|
||||
{ label: '14#土壤湿度', value: 14 },],
|
||||
list1:40,
|
||||
typeList2: [
|
||||
// { label: '平均1#土壤湿度', value: 0 },
|
||||
{ label: '1#土壤温度', value: 1 },
|
||||
{ label: '2#土壤温度', value: 2 },
|
||||
{ label: '3#土壤温度', value: 3 },
|
||||
{ label: '4#土壤温度', value: 4 },
|
||||
{ label: '5#土壤温度', value: 5 },
|
||||
{ label: '6#土壤温度', value: 6 },
|
||||
{ label: '7#土壤温度', value: 7 },
|
||||
{ label: '8#土壤温度', value: 8 },
|
||||
{ label: '9#土壤温度', value: 9 },
|
||||
{ label: '10#土壤温度', value: 10 },
|
||||
{ label: '11#土壤温度', value: 11 },
|
||||
{ label: '12#土壤温度', value: 12 },
|
||||
{ label: '13#土壤温度', value: 13 },
|
||||
{ label: '14#土壤温度', value: 14 },],
|
||||
list2:40,
|
||||
typeList3: [
|
||||
{ label: '加热模式', value: 1 },
|
||||
|
|
|
|||
|
|
@ -825,7 +825,7 @@ export default {
|
|||
this.inputData = res.data.data;
|
||||
// this.getType();
|
||||
// this.getType00();
|
||||
this.get53data(this.inputData['1' + (10 + (this.indexs - 1)) + "51"]);
|
||||
this.get53data(this.inputData['1' + (10 + (this.indexs - 1)) + "53"]);
|
||||
this.inputData['1' + (10 + (indexs - 1)) + '01'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '01'])
|
||||
this.inputData['1' + (10 + (indexs - 1)) + '06'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '06'])
|
||||
this.inputData['1' + (10 + (indexs - 1)) + '17'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '17'])
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- 控制器/施肥机 -->
|
||||
<div class="page-content new-data" v-else :class="deviceName !=1 ? 'control-page' : ''">
|
||||
<div class="page-content new-data" v-else :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
|
||||
|
||||
<div class="control-view" v-if="deviceName !=1">
|
||||
<div class="control-view" v-if="deviceName == 10 || deviceName == 30">
|
||||
<div class="title" @click='weatherModel = true'>气象站:</div>
|
||||
<vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">
|
||||
<div class="list-view" v-for="item, index in controlList " :key="index">
|
||||
|
|
|
|||
|
|
@ -174,8 +174,6 @@ export default {
|
|||
},
|
||||
watch: {
|
||||
'active'(newVal, oldVal) {
|
||||
console.log(newVal,'active');
|
||||
|
||||
this.getSensorType()
|
||||
// this.getCountData()
|
||||
},
|
||||
|
|
@ -309,17 +307,11 @@ export default {
|
|||
}
|
||||
},
|
||||
getSensorType() {
|
||||
|
||||
var text='无意义的传感器'
|
||||
this.typeList.forEach((el, index) => {
|
||||
if (el.value == this.inputData[this.numberList[this.active]]) {
|
||||
console.log(el.label,this.numberList[this.active],this.inputData[this.numberList[this.active]],111);
|
||||
text = el.label
|
||||
this.sensorType = el.label
|
||||
}
|
||||
})
|
||||
setTimeout(() => {
|
||||
this.sensorType = text
|
||||
}, 10);
|
||||
},
|
||||
toIndex(index) {
|
||||
this.active = index
|
||||
|
|
|
|||
|
|
@ -507,7 +507,7 @@ export default {
|
|||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10001', dataNum);
|
||||
this.changeBtn('500', dataNum);
|
||||
},
|
||||
selList2(index) {
|
||||
if (this.actList2.indexOf(index) == -1) {
|
||||
|
|
@ -526,120 +526,7 @@ export default {
|
|||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10002', dataNum);
|
||||
},
|
||||
selList3(index) {
|
||||
if (this.actList3.indexOf(index) == -1) {
|
||||
this.actList3.push(index)
|
||||
} else {
|
||||
this.actList3.splice(this.actList3.indexOf(index), 1)
|
||||
}
|
||||
this.actList3New=['0','0','0','0','0']
|
||||
this.actList3.forEach((el, index) => {
|
||||
this.actList3New[this.actList3New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList3New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10003', dataNum);
|
||||
},
|
||||
selList4(index) {
|
||||
if (this.actList4.indexOf(index) == -1) {
|
||||
this.actList4.push(index)
|
||||
} else {
|
||||
this.actList4.splice(this.actList4.indexOf(index), 1)
|
||||
}
|
||||
this.actList4New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0']
|
||||
this.actList4.forEach((el, index) => {
|
||||
this.actList4New[this.actList4New.length-el-1] = '1'
|
||||
})
|
||||
var num = this.actList4New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10004', dataNum);
|
||||
},
|
||||
selList5(index) {
|
||||
if (this.actList5.indexOf(index) == -1) {
|
||||
this.actList5.push(index)
|
||||
} else {
|
||||
this.actList5.splice(this.actList5.indexOf(index), 1)
|
||||
}
|
||||
this.actList5New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0']
|
||||
this.actList5.forEach((el, index) => {
|
||||
this.actList5New[this.actList5New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList5New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10005', dataNum);
|
||||
},
|
||||
selList6(index) {
|
||||
if (this.actList6.indexOf(index) == -1) {
|
||||
this.actList6.push(index)
|
||||
} else {
|
||||
this.actList6.splice(this.actList6.indexOf(index), 1)
|
||||
}
|
||||
this.actList6New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0']
|
||||
this.actList6.forEach((el, index) => {
|
||||
this.actList6New[this.actList6New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList6New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10006', dataNum);
|
||||
},
|
||||
selList7(index) {
|
||||
if (this.actList7.indexOf(index) == -1) {
|
||||
this.actList7.push(index)
|
||||
} else {
|
||||
this.actList7.splice(this.actList7.indexOf(index), 1)
|
||||
}
|
||||
this.actList7New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0']
|
||||
this.actList7.forEach((el, index) => {
|
||||
this.actList7New[this.actList7New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList7New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10007', dataNum);
|
||||
},
|
||||
selList8(index) {
|
||||
if (this.actList8.indexOf(index) == -1) {
|
||||
this.actList8.push(index)
|
||||
} else {
|
||||
this.actList8.splice(this.actList8.indexOf(index), 1)
|
||||
}
|
||||
this.actList8New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0']
|
||||
this.actList8.forEach((el, index) => {
|
||||
this.actList6New[this.actList8New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList8New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('10008', dataNum);
|
||||
this.changeBtn('501', dataNum);
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue