fix：性诱2.0历史数据不显示修复

pages/cb/xy2.0/historydatas.vue

@@ -47,13 +47,13 @@
 						</tr>
 						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
 							<td class="td">{{items.xy_addtime|timeFormat()}}</td>
-							<td class="td">{{items.at==""?"--":items.at}}</td>
-							<td class="td">{{items.ah==""?"--":items.ah}}</td>
-							<td class="td">{{items.warn==""?"--":items.warn}}</td>
-							<td class="td">{{items.b_V==""?"--":items.b_V}}</td>
-							<td class="td">{{items.b_c==""?"--":items.b_c}}</td>
-							<td class="td">{{items.p_v==""?"--":items.p_v}}</td>
-							<td class="td">{{items.p_c==""?"--":items.p_c}}</td>
+							<td class="td">{{items.at==""?"0":items.at}}</td>
+							<td class="td">{{items.ah==""?"0":items.ah}}</td>
+							<!-- <td class="td">{{items.warn==""?"0":items.warn}}</td> -->
+							<td class="td">{{items.b_V==""?"0":items.b_V}}</td>
+							<td class="td">{{items.b_c==""?"0":items.b_c}}</td>
+							<td class="td">{{items.p_v==""?"0":items.p_v}}</td>
+							<td class="td">{{items.p_c==""?"0":items.p_c}}</td>
 						</tr>
 						<tr class="tr" v-if="forbidden">
 							<td class="td" v-for="item in 8">暂无数据</td>
@@ -65,9 +65,9 @@
 						</tr>
 						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
 							<td class="td">{{items.xy_addtime|timeFormat()}}</td>
-							<td class="td">{{items.at==""?"--":items.at}}</td>
-							<td class="td">{{items.ah==""?"--":items.ah}}</td>
-							<td class="td">{{items.warn==""?"--":items.warn}}</td>
+							<td class="td">{{items.at==""?"0":items.at}}</td>
+							<td class="td">{{items.ah==""?"0":items.ah}}</td>
+							<!-- <td class="td">{{items.warn==""?"--":items.warn}}</td> -->
 						</tr>
 						<tr class="tr" v-if="forbidden">
 							<td class="td" v-for="item in 4">暂无数据</td>
@@ -109,8 +109,8 @@
 				device_id: '',
 				page: 1,
 				historylistdata: [],
-				thdata: ["上报时间", "环境温度(°C)", "环境湿度(%)", "虫害预警", "电池电压", "电池电流", "太阳能板电压", "太阳能板电流"],
-				thdata2: ["上报时间", "环境温度(°C)", "环境湿度(%)", "虫害预警"],
+				thdata: ["上报时间", "环境温度(°C)", "环境湿度(%)", "电池电压", "电池电流", "太阳能板电压", "太阳能板电流"],
+				thdata2: ["上报时间", "环境温度(°C)", "环境湿度(%)"],
 				forbidden: false,
 				cWidth: '400',
 				cHeight: '400',
@@ -121,6 +121,7 @@
 				worms: [],
 				timeshow:false,
 				mode: 'range',
+				device_code:0
 			}
 		},
 		methods: {
@@ -132,7 +133,8 @@
 						device_id: this.device_id,
 						start_time: parseInt(this.start_time / 1000),
 						end_time: parseInt(this.end_time / 1000),
-						status: "pest"
+						status: "pest",
+						device_code:this.device_code
 					}
 				})
 				this.dataloadingtf = false
@@ -169,7 +171,8 @@
 						device_id: this.device_id,
 						start_time: parseInt(this.start_time / 1000),
 						end_time: parseInt(this.end_time / 1000),
-						page: this.page
+						page: this.page,
+						device_code:this.device_code
 					}
 				})
 				this.historylistdata = res.data
@@ -304,6 +307,7 @@
 			console.log(option)
 			this.d_id = option.d_id
 			this.device_id = option.device_id
+			this.device_code = option.device_code
 			this.cWidth = uni.upx2px(650);
 			this.cHeight = uni.upx2px(500);
 		},

pages/cb/xy2.0/particulars.vue

@@ -208,7 +208,7 @@
 			},
 			toggle(){
 				uni.navigateTo({
-					url:"./historydatas?device_id="+this.equipInfo.device_id + "&d_id=" + this.equipInfo.d_id
+					url:"./historydatas?device_id="+this.equipInfo.device_id + "&d_id=" + this.equipInfo.d_id+ "&device_code=" + this.equipInfo.device_code
 				})
 			},
 			addxy(){