~
This commit is contained in:
		
							parent
							
								
									f295de66a6
								
							
						
					
					
						commit
						857f77487e
					
				@ -213,7 +213,7 @@
 | 
				
			|||||||
				</view>
 | 
									</view>
 | 
				
			||||||
				<view class="updateTime">
 | 
									<view class="updateTime">
 | 
				
			||||||
					<span></span>
 | 
										<span></span>
 | 
				
			||||||
					<span>*更新数据时间 :  {{ updateTime[index1] }}</span>
 | 
										<span>*更新数据时间 :  {{ (updateTime.filter(el=> el.equipmentId == item1.deviceId)).length > 0 ? (updateTime.filter(el=> el.equipmentId == item1.deviceId))[0].updateTime : '暂无'}}</span>
 | 
				
			||||||
				</view>
 | 
									</view>
 | 
				
			||||||
			</view>
 | 
								</view>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -485,7 +485,7 @@
 | 
				
			|||||||
									i.childList_fourteen = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 14);
 | 
														i.childList_fourteen = res.data.filter(el => (this.getStatus(el.equipmentNumber, el.targetValue)) == (el.equipmentNumber + '#') && el.equipmentNumber == 14);
 | 
				
			||||||
									
 | 
														
 | 
				
			||||||
									
 | 
														
 | 
				
			||||||
									this.updateTime.push(res.data[0].updateTime ? res.data[0].updateTime : '暂无')
 | 
														this.updateTime.push(res.data[0])
 | 
				
			||||||
									
 | 
														
 | 
				
			||||||
									// console.log(this.waterAndFertilizerParamsList);
 | 
														// console.log(this.waterAndFertilizerParamsList);
 | 
				
			||||||
								} else {
 | 
													} else {
 | 
				
			||||||
@ -513,6 +513,7 @@
 | 
				
			|||||||
				})
 | 
									})
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// 跳转到折线图
 | 
								// 跳转到折线图
 | 
				
			||||||
			toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName) {
 | 
								toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue, unit, equipmentName) {
 | 
				
			||||||
				uni.navigateTo({
 | 
									uni.navigateTo({
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -354,6 +354,15 @@ var render = function () {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
      var g14 = item1.childList_fourteen.length
 | 
					      var g14 = item1.childList_fourteen.length
 | 
				
			||||||
 | 
					      var g15 = _vm.updateTime.filter(function (el) {
 | 
				
			||||||
 | 
					        return el.equipmentId == item1.deviceId
 | 
				
			||||||
 | 
					      }).length
 | 
				
			||||||
 | 
					      var g16 =
 | 
				
			||||||
 | 
					        g15 > 0
 | 
				
			||||||
 | 
					          ? _vm.updateTime.filter(function (el) {
 | 
				
			||||||
 | 
					              return el.equipmentId == item1.deviceId
 | 
				
			||||||
 | 
					            })
 | 
				
			||||||
 | 
					          : null
 | 
				
			||||||
      return {
 | 
					      return {
 | 
				
			||||||
        $orig: $orig,
 | 
					        $orig: $orig,
 | 
				
			||||||
        l0: l0,
 | 
					        l0: l0,
 | 
				
			||||||
@ -386,6 +395,8 @@ var render = function () {
 | 
				
			|||||||
        g13: g13,
 | 
					        g13: g13,
 | 
				
			||||||
        l14: l14,
 | 
					        l14: l14,
 | 
				
			||||||
        g14: g14,
 | 
					        g14: g14,
 | 
				
			||||||
 | 
					        g15: g15,
 | 
				
			||||||
 | 
					        g16: g16,
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
@ -946,7 +957,7 @@ var _default = {
 | 
				
			|||||||
                i.childList_fourteen = res.data.filter(function (el) {
 | 
					                i.childList_fourteen = res.data.filter(function (el) {
 | 
				
			||||||
                  return _this.getStatus(el.equipmentNumber, el.targetValue) == el.equipmentNumber + '#' && el.equipmentNumber == 14;
 | 
					                  return _this.getStatus(el.equipmentNumber, el.targetValue) == el.equipmentNumber + '#' && el.equipmentNumber == 14;
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
                _this.updateTime.push(res.data[0].updateTime ? res.data[0].updateTime : '暂无');
 | 
					                _this.updateTime.push(res.data[0]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                // console.log(this.waterAndFertilizerParamsList);
 | 
					                // console.log(this.waterAndFertilizerParamsList);
 | 
				
			||||||
              } else {
 | 
					              } else {
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user