diff --git a/pages/timeEnvironment/timeEnvironment.vue b/pages/timeEnvironment/timeEnvironment.vue index 125d50d..dc562e2 100644 --- a/pages/timeEnvironment/timeEnvironment.vue +++ b/pages/timeEnvironment/timeEnvironment.vue @@ -23,7 +23,7 @@ 欢迎使用温室智慧云数据统计 - + - + @@ -83,20 +91,24 @@ {{item0.deviceTypeName}} - + {{ getStatus(item.equipmentNumber,item.targetValue) + item.environmentDataId }} - {{ item.equipmentStart == 0 ? '故障' : ((item.formula == '12' ? getWindDirection(item.environmentData) : item.environmentData) + (item.formula == '12' ? '' : getTypeList(item.formula))) }} + + {{ item.equipmentStart == 0 ? '故障' : ((item.formula == '12' ? getWindDirection(item.environmentData) : item.environmentData) + (item.formula == '12' ? '' : getTypeList(item.formula))) }} + - *更新数据时间 :  {{ (updateTime20.filter(el=> el.equipmentId == item0.deviceId)).length > 0 ? (updateTime20.filter(el=> el.equipmentId == item0.deviceId))[0].updateTime : '暂无'}} + *更新数据时间 : +  {{ (updateTime20.filter(el=> el.equipmentId == item0.deviceId)).length > 0 ? (updateTime20.filter(el=> el.equipmentId == item0.deviceId))[0].updateTime : '暂无'}} @@ -114,12 +126,14 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : (item2.environmentData + getTypeList(item2.formula)) }} + + {{ item2.equipmentStart == 0 ? '故障' : (item2.environmentData + getTypeList(item2.formula)) }} + - - + + @@ -127,11 +141,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -139,11 +155,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -151,11 +169,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -163,11 +183,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -175,11 +197,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -187,11 +211,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -199,11 +225,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -211,11 +239,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -223,11 +253,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -235,11 +267,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -247,11 +281,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -259,11 +295,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -271,11 +309,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -283,11 +323,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -295,11 +337,13 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + @@ -307,18 +351,21 @@ {{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }} - {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + + {{ item2.equipmentStart == 0 ? '故障' : item2.environmentData + getTypeList(item2.formula) }} + - + - *更新数据时间 :  {{ (updateTime.filter(el=> el.equipmentId == item1.deviceId)).length > 0 ? (updateTime.filter(el=> el.equipmentId == item1.deviceId))[0].updateTime : '暂无'}} + *更新数据时间 : +  {{ (updateTime.filter(el=> el.equipmentId == item1.deviceId)).length > 0 ? (updateTime.filter(el=> el.equipmentId == item1.deviceId))[0].updateTime : '暂无'}} - + @@ -444,17 +491,17 @@ timer: null, updateTime: [], - - weatherList:[], - weatherDeviceName:'', - updateTimeWeather:[], - - equipmentName30List:[], - equipmentName30ListChild:[], - equipmentName20List:[], - equipmentName20ListChild:[], - updateTime30:[], - updateTime20:[], + + weatherList: [], + weatherDeviceName: '', + updateTimeWeather: [], + + equipmentName30List: [], + equipmentName30ListChild: [], + equipmentName20List: [], + equipmentName20ListChild: [], + updateTime30: [], + updateTime20: [], } }, onLoad() { @@ -524,7 +571,7 @@ // }) // } // }) - + }, methods: { // 根据用户id查询对应的设备数据 @@ -542,41 +589,41 @@ if (res.code == 200) { this.equipmentName30List = []; this.equipmentName20List = []; - res.data.forEach(el=>{ - if(el.equipmentName == 30){ + res.data.forEach(el => { + if (el.equipmentName == 30) { this.equipmentName30List.push(el) } - if(el.equipmentName == 20){ + if (el.equipmentName == 20) { this.equipmentName20List.push(el) } }) - if(this.equipmentName30List.length != 0){ + if (this.equipmentName30List.length != 0) { this.getcontrol_rtDatastation1() } - if(this.equipmentName20List.length != 0){ + if (this.equipmentName20List.length != 0) { this.getFi_rtdata() } this.waterAndFertilizerParamsList = res.data.map((item, index) => { return { ...item, childList: [], - childList_mubiao: [],//目标 - childList_1: [],//平均 - childList_2: [],//平均 - childList_one: [],//1# - childList_two: [],//2# - childList_three: [],//3# - childList_four: [],//4# - childList_five: [],//5# - childList_six: [],//6# - childList_seven: [],//7# - childList_eight: [],//8# - childList_nine: [],//9# - childList_ten: [],//10# - childList_eleven: [],//11# - childList_twelve: [],//12# - childList_thirteen: [],//13# - childList_fourteen: [],//14# + childList_mubiao: [], //目标 + childList_1: [], //平均 + childList_2: [], //平均 + childList_one: [], //1# + childList_two: [], //2# + childList_three: [], //3# + childList_four: [], //4# + childList_five: [], //5# + childList_six: [], //6# + childList_seven: [], //7# + childList_eight: [], //8# + childList_nine: [], //9# + childList_ten: [], //10# + childList_eleven: [], //11# + childList_twelve: [], //12# + childList_thirteen: [], //13# + childList_fourteen: [], //14# } }) this.updateTime = [] @@ -595,30 +642,68 @@ // }); uni.stopPullDownRefresh(); i.childList = res.data; - i.childList_mubiao = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == '目标' || (this.getStatus(el.equipmentNumber, el.targetValue)) == ('目标' + el.equipmentNumber +'#')); - i.childList_1 = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == '1#平均'); - i.childList_2 = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == '2#平均'); - - i.childList_one = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 1); + i.childList_mubiao = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == '目标' || (this + .getStatus(el.equipmentNumber, el.targetValue)) == + ('目标' + el.equipmentNumber + '#')); + i.childList_1 = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == '1#平均'); + i.childList_2 = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == '2#平均'); + + i.childList_one = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 1); // i.childList_one = [...i.childList_1,...i.childList_one]; - i.childList_two = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 2); + i.childList_two = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 2); // i.childList_two = [...i.childList_2,...i.childList_two] - i.childList_three = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 3); - i.childList_four = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 4); - i.childList_five = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 5); - i.childList_six = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 6); - i.childList_seven = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 7); - i.childList_eight = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 8); - i.childList_nine = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 9); - i.childList_ten = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 10); - i.childList_eleven = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 11); - i.childList_twelve = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 12); - i.childList_thirteen = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 13); - i.childList_fourteen = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 14); - - + i.childList_three = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 3); + i.childList_four = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 4); + i.childList_five = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 5); + i.childList_six = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 6); + i.childList_seven = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 7); + i.childList_eight = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 8); + i.childList_nine = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == 9); + i.childList_ten = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == + 10); + i.childList_eleven = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == + 11); + i.childList_twelve = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == + 12); + i.childList_thirteen = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == + 13); + i.childList_fourteen = res.data.filter(el => (this.getStatus(el + .equipmentNumber, el.targetValue)) == (el + .equipmentNumber + '#') && el.equipmentNumber == + 14); + + this.updateTime.push(res.data[0]) - + // console.log(this.waterAndFertilizerParamsList); } else { this.updateTime.push('暂无') @@ -644,10 +729,10 @@ } }) }, - + // 跳转到折线图 - toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName,flag) { + toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName, flag) { uni.navigateTo({ url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + @@ -677,138 +762,163 @@ // } else if (targetValue == 0 && equipmentNumber != 0 && equipmentNumber != 15) { // return equipmentNumber + '#' // } - - if(targetValue == 1){ - if(equipmentNumber ==0){ + + if (targetValue == 1) { + if (equipmentNumber == 0) { return '目标' - }else{ - return '目标'+ equipmentNumber +'#' + } else { + return '目标' + equipmentNumber + '#' } - }else { - if(equipmentNumber ==0){ + } else { + if (equipmentNumber == 0) { return '1#平均' - }else if(equipmentNumber == 15){ + } else if (equipmentNumber == 15) { return '2#平均' - }else { - return equipmentNumber +'#' + } else { + return equipmentNumber + '#' } } - + + }, + getStatusNew(el) { + var name = '' + if (el.targetValue == 1) { + if (el.equipmentNumber == 0) { + name = '目标' + el.environmentDataId + } else { + name = '目标' + el.equipmentNumber + '#' + el.environmentDataId + } + } else { + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId + } else if (el.equipmentNumber == 15) { + name = '2#平均' + el.environmentDataId + } else { + name = el.equipmentNumber + '#' + el.environmentDataId + } + } + return name }, - // 气象站 - getcontrol_geteqetdata(userId){ + getcontrol_geteqetdata(userId) { this.$http({ url: this.api.getcontrol_geteqetdata + '?userId=' + userId, method: 'GET' - }).then(res=>{ + }).then(res => { // console.log(res,'小程序气象站显示'); - if(res.code == 200){ + if (res.code == 200) { this.weatherList = res.data - this.weatherList = this.weatherList.map((item,index)=>{ + this.weatherList = this.weatherList.map((item, index) => { return { ...item, - weatherListChild:[] + weatherListChild: [] } }) this.updateTimeWeather = [] - this.weatherList.forEach(el=>{ + this.weatherList.forEach(el => { // 主页查看控制器气象站实时数据 this.$http({ - url:this.api.getcontrol_rtDatastation + '?equipmentId=' + el.deviceId, + url: this.api.getcontrol_rtDatastation + '?equipmentId=' + el + .deviceId, method: 'GET' - }).then(res=>{ + }).then(res1 => { // console.log(res,'主页查看控制器气象站实时数据'); - if(res.code == 200){ - el.weatherListChild = res.data; + if (res1.code == 200) { + res1.data.forEach((el1, index) => { + el.weatherListChild.push({ + ...el1, + environmentDataId: this.getStatusNew( + el1), + }) + }) this.updateTimeWeather.push(res.data[0]) - + } - + }) }) - + } - + }) }, - + // 主页查看控制器气象站实时数据 - getcontrol_rtDatastation(equipmentId){ - + getcontrol_rtDatastation(equipmentId) { + }, // 获取deviceName为20的智能灌溉实时数据 - getFi_rtdata(){ - this.equipmentName20List = this.equipmentName20List.map((item,index)=>{ + getFi_rtdata() { + this.equipmentName20List = this.equipmentName20List.map((item, index) => { return { ...item, - equipmentName20ListChild:[] + equipmentName20ListChild: [] } }) - + this.updateTime20 = [] - this.equipmentName20List.forEach(el=>{ + this.equipmentName20List.forEach(el => { this.$http({ - url:this.api.getFi_rtdata + '?equipmentId=' + el.deviceId, + url: this.api.getFi_rtdata + '?equipmentId=' + el.deviceId, method: 'GET' - }).then(res=>{ - if(res.code == 200){ + }).then(res => { + if (res.code == 200) { console.log(res.data); el.equipmentName20ListChild = res.data; - this.updateTime20.push(res.data[0]?res.data[0]:[]) - + this.updateTime20.push(res.data[0] ? res.data[0] : []) + } - + }) }) console.log(this.equipmentName20List); - + }, // 获取deviceName为30的气象站实时数据 - getcontrol_rtDatastation1(){ - this.equipmentName30List = this.equipmentName30List.map((item,index)=>{ + getcontrol_rtDatastation1() { + this.equipmentName30List = this.equipmentName30List.map((item, index) => { return { ...item, - equipmentName30ListChild:[] + equipmentName30ListChild: [] } }) - + this.updateTime30 = [] - this.equipmentName30List.forEach(el=>{ + this.equipmentName30List.forEach(el => { this.$http({ - url:this.api.getcontrol_rtDatastation + '?equipmentId=' + el.deviceId, + url: this.api.getcontrol_rtDatastation + '?equipmentId=' + el.deviceId, method: 'GET' - }).then(res=>{ - if(res.code == 200){ + }).then(res => { + if (res.code == 200) { el.equipmentName30ListChild = res.data; this.updateTime30.push(res.data[0]) } - + }) }) // console.log(this.equipmentName30List,'this.equipmentName30List'); }, - + // 风向判定 - getWindDirection(number){ + getWindDirection(number) { let num = Number(number) - if(num <= 67 && num >= 22 ){ + if (num <= 67 && num >= 22) { return '东北' - }else if(num > 67 && num < 112){ + } else if (num > 67 && num < 112) { return '东' - }else if(num >= 112 && num <= 157){ + } else if (num >= 112 && num <= 157) { return '东南' - }else if(num > 157 && num < 202){ + } else if (num > 157 && num < 202) { return '南' - }else if(num >= 202 && num <= 247){ + } else if (num >= 202 && num <= 247) { return '西南' - }else if(num > 247 && num < 292){ + } else if (num > 247 && num < 292) { return '西' - }else if(num >= 292 && num <= 337){ + } else if (num >= 292 && num <= 337) { return '西北' - }else if(num < 22){ + } else if (num < 22) { return '北' - }else if(num > 337){ + } else if (num > 337) { return '北' } } @@ -1133,7 +1243,7 @@ } } } - + .line { width: 100%; height: 1rpx;