-
账号登录
+
账号登录
diff --git a/src/views/temperature/report/Line.vue b/src/views/temperature/report/Line.vue
index d38f3e7..737a15b 100644
--- a/src/views/temperature/report/Line.vue
+++ b/src/views/temperature/report/Line.vue
@@ -118,7 +118,7 @@
}
//图例类型
- let typeArr = Array.from(new Set(props.chartData.map((item) => item.code)));
+ let typeArr = Array.from(new Set(props.chartData.map((item) => item.houseName)));
//轴数据
let xAxisData = Array.from(new Set(props.chartData.map((item) => item.reportHour+":00")));
console.log(xAxisData);
@@ -126,7 +126,7 @@
typeArr.forEach((type) => {
console.log(type);
let obj: any = { name: type,type: 'line', smooth: true };
- const findItem: any = props.chartData.find((item: any) => item.code == type);
+ const findItem: any = props.chartData.find((item: any) => item.houseName == type);
if (findItem && findItem.color) {
obj.color = findItem.color;
}
@@ -134,7 +134,7 @@
// update-begin-author:liusq date:2023-7-12 for: [issues/613] LineMulti 在数据不对齐时，横坐标计算错误
let data = [];
xAxisData.forEach((x) => {
- let dataArr = props.chartData.filter((item) => type === item.code && item.reportHour+":00" === x);
+ let dataArr = props.chartData.filter((item) => type === item.houseName && item.reportHour+":00" === x);
if (dataArr && dataArr.length > 0) {
data.push(dataArr[0].roomTemp);
} else {
diff --git a/src/views/temperature/report/TemperatureList.vue b/src/views/temperature/report/TemperatureList.vue
index 8dea819..a133c99 100644
--- a/src/views/temperature/report/TemperatureList.vue
+++ b/src/views/temperature/report/TemperatureList.vue
@@ -21,7 +21,7 @@
@@ -31,7 +31,7 @@
@@ -41,7 +41,7 @@
@@ -51,7 +51,7 @@
@@ -114,6 +114,10 @@ let code = ref('');
let code2 = ref('');
let code3 = ref('');
let code4 = ref('');
+let houseName = ref('');
+let houseName2 = ref('');
+let houseName3 = ref('');
+let houseName4 = ref('');
const TimeFun = () => {
setInterval(() => {
@@ -130,26 +134,58 @@ const TimeFun = () => {
};
const getTempDataFn = async () => {
- const resData = await findOne({"SDate": currentDate.value,"code": "867896071477072"});
gaugeData.value["title"] = "";
- gaugeData.value["name"] = resData.code;
- gaugeData.value["value"] = resData.roomTemp;
- code.value = resData.code;
- tempDate.value = resData.roomTemp;
- reportTime.value = resData.reportTime;
+ const resData = await findOne({"SDate": currentDate.value,"code": "861877074735720"});
+ if(resData!=null){
+ // gaugeData.value["name"] = resData.code;
+ gaugeData.value["name"] = resData.houseName;
+ gaugeData.value["value"] = resData.roomTemp;
+ tempDate.value = resData.roomTemp;
+ reportTime.value = resData.reportTime;
+ code.value = resData.code;
+ houseName.value = resData.houseName;
+ }else{
+ gaugeData.value["name"] = '';
+ gaugeData.value["value"] = 0;
+ }
const resData2 = await findOne({"SDate": currentDate.value,"code": "867896075324312"});
- gaugeData2.value["name"] = resData2.code;
- gaugeData2.value["value"] = resData2.roomTemp;
- code2.value = resData2.code;
+ console.log(resData2);
+ if(resData2!=null){
+ // gaugeData2.value["name"] = resData2.code;
+ gaugeData2.value["name"] = resData2.houseName;
+ gaugeData2.value["value"] = resData2.roomTemp;
+ reportTime.value = resData2.reportTime;
+ code2.value = resData2.code;
+ houseName2.value = resData2.houseName;
+ }else{
+ gaugeData2.value["name"] = '';
+ gaugeData2.value["value"] = 0;
+ }
const resData3 = await findOne({"SDate": currentDate.value,"code": "867896075536782"});
- gaugeData3.value["name"] = resData3.code;
- gaugeData3.value["value"] = resData3.roomTemp;
- code3.value = resData3.code;
+ if(resData3!=null){
+ // gaugeData3.value["name"] = resData3.code;
+ gaugeData3.value["name"] = resData3.houseName;
+ gaugeData3.value["value"] = resData3.roomTemp;
+ reportTime.value = resData3.reportTime;
+ code3.value = resData3.code;
+ houseName3.value = resData3.houseName;
+ }else{
+ gaugeData3.value["name"] = '';
+ gaugeData3.value["value"] = 0;
+ }
const resData4 = await findOne({"SDate": currentDate.value,"code": "867896075562028"});
- gaugeData4.value["name"] = resData4.code;
- gaugeData4.value["value"] = resData4.roomTemp;
- code4.value = resData4.code;
- gaugeData4.value["title"] = "实时温度";
+ if(resData4!=null){
+ // gaugeData4.value["name"] = resData4.code;
+ gaugeData4.value["name"] = resData4.houseName;
+ gaugeData4.value["value"] = resData4.roomTemp;
+ reportTime.value = resData4.reportTime;
+ code4.value = resData4.code;
+ houseName4.value = resData4.houseName;
+ gaugeData4.value["title"] = "实时温度";
+ }else{
+ gaugeData4.value["name"] = '';
+ gaugeData4.value["value"] = 0;
+ }
};
const getTempLineFn = async () => {