xsh 3 år sedan
förälder
incheckning
be3d740121
3 ändrade filer med 40 tillägg och 10 borttagningar
  1. 9 0
      src/utils/api.js
  2. 27 6
      src/views/BioSafety/BioSafety.vue
  3. 4 4
      src/views/Home/Home.vue

+ 9 - 0
src/utils/api.js

@@ -334,3 +334,12 @@ export function getLastVideo(data) {
   })
 }
 
+/** 金铭人脸  **/
+export function JmGroups(data) {
+  return axios({
+    url: 'video/AiFaceCount/groups',
+    method: 'get',
+    params: data
+  })
+}
+

+ 27 - 6
src/views/BioSafety/BioSafety.vue

@@ -187,19 +187,20 @@
               <div class="content-img"></div>
               <div style="color: white; font-size: 14px">
                 <p>正常进入</p>
-                <span><strong style="font-size: 22px; font-weight: 600">99</strong>人次</span>
+                <span><strong style="font-size: 22px; font-weight: 600">{{namalCount}}</strong>人次</span>
               </div>
             </div>
             <div class="bio-vertical-content">
               <div class="content-img content-img-1"></div>
               <div style="color: white; font-size: 14px">
                 <p>违规次数</p>
-                <span><strong style="font-size: 22px; font-weight: 600">27</strong>人次</span>
+                <span><strong style="font-size: 22px; font-weight: 600">{{alarmCount}}</strong>人次</span>
               </div>
             </div>
           </div>
           <div class="bio-vertical-right">
-            <chart-bar :data="data2"></chart-bar>
+            <chart-bar :data="data2" v-if="data2.data.length > 0"></chart-bar>
+            <div v-else style="line-height: 250px; width: 100%; color: white; font-size: 18px">暂无数据</div>
           </div>
         </div>
       </div>
@@ -332,7 +333,8 @@ import {
   getDoor,
   getCarWashVideo,
   getAlarmAndPig,
-  getBaseVideo
+  getBaseVideo,
+  JmGroups
 } from "@/utils/api";
 import axios from "axios";
 import {timeDate} from "@/utils";
@@ -378,8 +380,8 @@ export default {
       },
       data2: {
         id: 2,
-        time: ['8:00', '10:00', '12:00', '14:00', '16:00', '18:00', '20:00'],
-        data: [21, 13, 10, 14, 20, 23, 21],
+        time: [],
+        data: [],
         name: '',
         unit: '人次'
       },
@@ -425,6 +427,8 @@ export default {
       cameraOne: '',
       cameraTwo: '',
       isVideo: false,
+      namalCount: 0,
+      alarmCount: 0,
     }
   },
   computed: {
@@ -637,6 +641,23 @@ export default {
           this.cameraTwo = res.data[0].rtspUrl;
         }
       })
+
+      // 金铭人脸
+      JmGroups({}).then(res => {
+        if(res.code === 0) {
+          if(res.data !== null) {
+            console.log(res)
+            this.namalCount = res.namalCount;
+            this.alarmCount = res.alarmCount;
+            this.data2.time = [];
+            this.data2.data = [];
+            res.data.forEach(item => {
+              this.data2.time.push(item.time);
+              this.data2.data.push(item.value);
+            })
+          }
+        }
+      })
     },
     // 打开img
     open(item, num) {

+ 4 - 4
src/views/Home/Home.vue

@@ -99,12 +99,12 @@
           <div class="case-title">猪舍温度</div>
           <div class="case-content">
             <div class="case-one">
-              <span style=" padding-left: 20px;padding-right: 40px">最高</span>
-              <span><strong class="sign">{{env.maxTem ? env.maxTem + '℃': '0'}}</strong></span>
+              <span style=" padding-left: 20px;padding-right: 35px">最高</span>
+              <span><strong class="sign">{{env.maxTem ? env.maxTem : '0'}}</strong></span>
             </div>
             <div class="case-one">
-              <span style=" padding-left: 20px; padding-right: 40px">最低</span>
-              <span><strong class="sign">{{env.minTem ? env.minTem + '℃': '0'}}</strong></span>
+              <span style=" padding-left: 20px; padding-right: 35px">最低</span>
+              <span><strong class="sign">{{env.minTem ? env.minTem : '0'}}</strong></span>
             </div>
           </div>
         </div>