|
@@ -70,6 +70,7 @@
|
|
<script>
|
|
<script>
|
|
// import { reqReportList } from "@/api/groupManagment";
|
|
// import { reqReportList } from "@/api/groupManagment";
|
|
|
|
|
|
|
|
+import { mapActions } from "vuex";
|
|
import chart_a from "./charts/chart_a";
|
|
import chart_a from "./charts/chart_a";
|
|
import chart_b from "./charts/chart_b";
|
|
import chart_b from "./charts/chart_b";
|
|
|
|
|
|
@@ -131,62 +132,59 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ mainInfo: {},
|
|
dateArr: [],
|
|
dateArr: [],
|
|
animalTempArr: [],
|
|
animalTempArr: [],
|
|
envTempArr: [],
|
|
envTempArr: [],
|
|
batteryArr: [],
|
|
batteryArr: [],
|
|
pickerOptions,
|
|
pickerOptions,
|
|
value2: null,
|
|
value2: null,
|
|
- timer_1: null,
|
|
|
|
SData: Math.floor(( new Date().getTime() - 3600 * 1000 * 6 ) / 1000), // 默认最近六小时
|
|
SData: Math.floor(( new Date().getTime() - 3600 * 1000 * 6 ) / 1000), // 默认最近六小时
|
|
EData: Math.ceil(new Date().getTime() / 1000)
|
|
EData: Math.ceil(new Date().getTime() / 1000)
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
|
|
+ console.log(this.$route.query)
|
|
|
|
+ this.mainInfo = this.$route.query
|
|
// 一分钟更新一次 后端10分钟更新一次数据
|
|
// 一分钟更新一次 后端10分钟更新一次数据
|
|
- // this.getReportList()
|
|
|
|
- this.timer_1 = setInterval(() => {
|
|
|
|
- // this.getReportList()
|
|
|
|
- console.log("getReportList")
|
|
|
|
- }, 1000 * 60);
|
|
|
|
|
|
+ this.getHumitureList(1)
|
|
|
|
+ this.getHumitureList(2)
|
|
|
|
+
|
|
},
|
|
},
|
|
mounted() {},
|
|
mounted() {},
|
|
- beforeDestroy() {
|
|
|
|
- window.clearInterval(this.timer_1)
|
|
|
|
- },
|
|
|
|
|
|
+
|
|
methods: {
|
|
methods: {
|
|
|
|
+ ...mapActions(["fetch"]),
|
|
// 事件选择器值改变
|
|
// 事件选择器值改变
|
|
pickerChange(value) {
|
|
pickerChange(value) {
|
|
console.log(value)
|
|
console.log(value)
|
|
this.SData = Math.floor(new Date(value[0]).getTime() / 1000)
|
|
this.SData = Math.floor(new Date(value[0]).getTime() / 1000)
|
|
this.EData = Math.ceil(new Date(value[1]).getTime() / 1000)
|
|
this.EData = Math.ceil(new Date(value[1]).getTime() / 1000)
|
|
console.log(this.SData, this.EData)
|
|
console.log(this.SData, this.EData)
|
|
- // this.getReportList()
|
|
|
|
|
|
+ this.getHumitureList(1)
|
|
|
|
+ this.getHumitureList(2)
|
|
|
|
+ },
|
|
|
|
+ // 请求温湿度
|
|
|
|
+ getHumitureList(type) {
|
|
|
|
+ // type:1-温度 2-湿度
|
|
|
|
+ this.fetch({
|
|
|
|
+ api: "/hm/device/history/by-device-id",
|
|
|
|
+ method: "GET",
|
|
|
|
+ data: { deviceId: this.mainInfo.id, type}, //目前只有一个组织,其他参数调整钟
|
|
|
|
+ success: res => {
|
|
|
|
+ console.log(res)
|
|
|
|
+ },
|
|
|
|
+ fail: err => {
|
|
|
|
+ console.log(err);
|
|
|
|
+ if (err.errCode == "request_not_authorize") {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: "请重新登录",
|
|
|
|
+ type: "warning"
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
},
|
|
},
|
|
- // 请求个体数据 id 825 826 830
|
|
|
|
- // getReportList() {
|
|
|
|
- // reqReportList({ deviceId:825, start:this.SData, end:this.EData })
|
|
|
|
- // .then(res => {
|
|
|
|
- // let dateArr = [],
|
|
|
|
- // animalTempArr = [],
|
|
|
|
- // envTempArr = [],
|
|
|
|
- // batteryArr = []
|
|
|
|
- // res.forEach((item, index) => {
|
|
|
|
- // dateArr.push(item.created)
|
|
|
|
- // animalTempArr.push(item.animalTemp)
|
|
|
|
- // batteryArr.push(item.battery*100)
|
|
|
|
- // envTempArr.push(item.envTemp)
|
|
|
|
- // });
|
|
|
|
- // this.dateArr = dateArr
|
|
|
|
- // this.animalTempArr = animalTempArr
|
|
|
|
- // this.envTempArr = envTempArr
|
|
|
|
- // this.batteryArr = batteryArr
|
|
|
|
-
|
|
|
|
- // })
|
|
|
|
- // .catch(err => {
|
|
|
|
- // console.log( err);
|
|
|
|
- // });
|
|
|
|
- // },
|
|
|
|
}
|
|
}
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|