Browse Source

加了 830 825 的指数,矫正温度

linan 5 years ago
parent
commit
7ae375d1a2

+ 6 - 10
src/views/groupManagment/GroupRecord.vue

@@ -66,25 +66,19 @@ export default {
                 {
                     date: "2020-05-02",
                     name: "可用",
-                    id: '1235',
+                    id: '825',
                     address: "6895564457554"
                 },
                 {
                     date: "2020-05-04",
                     name: "不可用",
-                    id: '1237',
+                    id: '826',
                     address: "6895564456725"
                 },
                 {
-                    date: "2020-05-01",
-                    name: "不可用",
-                    id: '1238',
-                    address: "6895564415514"
-                },
-                {
                     date: "2020-05-03",
                     name: "可用",
-                    id: '1239',
+                    id: '830',
                     address: "6895564457594"
                 }
             ]
@@ -93,8 +87,10 @@ export default {
     created() {},
     methods: {
         look(row) {
+            console.log(row)
             this.$router.push({
-                path: 'UnityTrace'
+                path: 'UnityTrace',
+                query: row
             })
         },
         edit(row) {},

+ 9 - 3
src/views/groupManagment/UnityTrace/UnityTrace.vue

@@ -146,6 +146,7 @@ export default {
         };
     },
     created() {
+        this.mainInfo = this.$route.query
         // 一分钟更新一次   后端10分钟更新一次数据
         this.getReportList()
         this.timer_1 = setInterval(() => {
@@ -168,17 +169,22 @@ export default {
         },
         // 请求个体数据  id  825   826 830
         getReportList() {
-            reqReportList({ deviceId:825, start:this.SData, end:this.EData })
+            reqReportList({ deviceId:this.mainInfo.id, start:this.SData, end:this.EData })
                 .then(res => {
                     let dateArr = [], 
                         animalTempArr = [],
                         envTempArr = [],
                         batteryArr = []
+
+                    // 暂时用,为了调整830的数据
+                    let tt = 1
+                    if(this.mainInfo.id == 830 || 825) tt = 0.95
                     res.forEach((item, index) => {
                         dateArr.push(item.created)
-                        animalTempArr.push(item.animalTemp)
+                        
+                        animalTempArr.push((item.animalTemp * tt).toFixed(2))
                         batteryArr.push(item.battery*100)
-                        envTempArr.push(item.envTemp)
+                        envTempArr.push((item.envTemp * tt).toFixed(2))
                     });
                     this.dateArr = dateArr
                     this.animalTempArr = animalTempArr