Jelajahi Sumber

设备温湿度信息,接口已写,但文档不对

linan-0110 5 tahun lalu
induk
melakukan
b7cb5ab750

+ 2 - 1
src/sdk/config.js

@@ -1,5 +1,6 @@
 export default {
 export default {
-  serverAddress: 'http://115.238.57.190:8010',
+  // serverAddress: 'http://115.238.57.190:8010',
+  serverAddress: '',
   timeout:50000,
   timeout:50000,
   method:'POST',
   method:'POST',
   clientid:1,//客户端编号
   clientid:1,//客户端编号

+ 2 - 1
src/views/deviceManagement/DeviceInfo.vue

@@ -317,7 +317,8 @@ export default {
         // 
         // 
         look(row) {
         look(row) {
             this.$router.push({
             this.$router.push({
-                path: "deviceHumiture"
+                path: "deviceHumiture",
+                query: row
             })
             })
         },
         },
 
 

+ 32 - 34
src/views/deviceManagement/deviceHumiture/deviceHumiture.vue

@@ -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>

+ 9 - 12
vue.config.js

@@ -14,17 +14,14 @@ module.exports = {
     }
     }
   },
   },
   devServer: {
   devServer: {
-    disableHostCheck: true
-    // proxy: {
-    //   '/': {                //这里最好有一个 /
-    //     target: 'http://115.238.57.190:8010',         // 服务器端接口地址
-    //     ws: true,            //如果要代理 websockets,配置这个参数
-    //     // 如果是https接口,需要配置这个参数
-    //     changeOrigin: true,  //是否跨域
-    //     pathRewrite: {
-    //       '^/api': ''
-    //     }
-    //   }
-    // }
+    disableHostCheck: true,
+    proxy: {
+      '^/': {                //这里最好有一个 /
+        target: 'http://115.238.57.190:8010',         // 服务器端接口地址
+        ws: true,            //如果要代理 websockets,配置这个参数
+        // 如果是https接口,需要配置这个参数
+        changeOrigin: true,  //是否跨域
+      }
+    }
   }
   }
 }
 }