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

Compare commits

base: xiaomeng:b6937ed84036f490a1f20ab44070a9b94c199f4b
Branches Tags
xiaomeng:main
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:53f0908869b2f637dcd63bc3df1717d8bea6b329
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "b6937ed84036f490a1f20ab44070a9b94c199f4b" and "53f0908869b2f637dcd63bc3df1717d8bea6b329" have entirely different histories.
b6937ed840 ... 53f0908869

2 changed files with 16 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
src/views/index.vue
View File

@ -233,22 +233,20 @@ export default {
}
},
toRouter1(item) {
console.log(item, 11, this.routerNow);
if (item.router) {
if (item.http) {
window.location.href = item.http;
} else if (item.router == 'formula' && this.$route.query.index != item.index) {
if (this.routerNow == 'realTime') {
this.$store.state.equipmentIndex = item.index
this.$router.push({ path: `/realTime?index=${item.index ? item.index : 1}&name=${item.deviceName}` })
} else if (this.routerNow == 'formula') {
this.$store.state.equipmentIndex = item.index
this.$router.push({ path: `/formula?index=${item.index ? item.index : 1}` })
} else if (this.routerNow == 'history') {
this.$store.state.equipmentIndex = item.index
this.$router.push({ path: `/history?index=${item.index ? item.index : 1}` })
} else if (this.routerNow == 'dataAnalysis') {
this.$store.state.equipmentIndex = item.index
this.$router.push({ path: `/dataAnalysis?index=${item.index ? item.index : 1}` })
} else if (item.router == 'formula') {
this.$store.state.equipmentIndex = item.index

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

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