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

pc-master #24

Merged
xiaomeng merged 3 commits from pc-master into portal 2023-11-09 06:49:12 +00:00
Conversation 0 Commits 3 Files Changed 4 +12 -15
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0aeb0251c5 - Show all commits

27
src/views/page/upload-con.vue
View File

@ -112,20 +112,17 @@ export default {
//平均值数据
actList2: [],
actList2New: [],
list2: ['目标水肥PH数据',
'目标水肥EC数据',
'平均水肥PH数据',
'平均水肥EC数据',
'1#水肥PH数据',
'1#水肥EC数据',
'2#水肥PH数据',
'2#水肥EC数据',
'1#通道传感器数据',
'2#通道传感器数据',
'3#通道传感器数据',
'4#通道传感器数据',
'5#通道传感器数据',
'6#通道传感器数据'],
list2: ['1#平均温度传感器',
'2#平均温度传感器',
'1#平均湿度传感器',
'2#平均湿度传感器',
'1#平均光照传感器',
'1#平均CO2传感器',
'1#平均土温传感器',
'1#平均土湿传感器',
'1#平均PH传感器',
'1#平均EC传感器',
'1#水温传感器',],
//目标值数据
actList3: [],
actList3New: [],
@ -222,7 +219,7 @@ export default {
getAct2() {
this.actList2=[]
var num = this.inputData['21503']
var num2 = this.padString(num.toString(2), 14)
var num2 = this.padString(num.toString(2), 11)
this.actList2New=num2.split("")
this.actList2New.forEach((el,index)=>{
if(el=='1'){