环境监测详情判断

pages/cb/index/index.vue

@@ -96,6 +96,7 @@
 						list: [],
 						pageIndex: 1,
 						tf:false,
+						device_model: 1
 					},
 					{
 						name: '性诱2.0',
@@ -239,7 +240,8 @@
 						device_type_id: this.equipArr[act].type,
 						page: this.equipArr[act].pageIndex,
 						page_size: 10,
-						device_status:this.device_status
+						device_status:this.device_status,
+						device_model: this.equipArr[act].device_model ? this.equipArr[act].device_model:0
 					}
 				})
 				this.loadingtf =false

pages/environment/equipment.vue

@@ -142,7 +142,7 @@
 						if (res.conf[key].indexOf("#") != -1) {
 							// let lable = res.conf[key].replace("#", "(") + ")"
 							console.log(res.conf[key])
-							if(res.dat[key].split('#')[0] == -99.99) return
+							// if(res.dat[key].split('#')[0] == -99.99) return
 							this.olddata.push({
 								lable:res.conf[key].replace("#", "(") + ")",
 								value:res.dat[key].split('#')