xsh пре 3 година
родитељ
комит
b5c7882100
4 измењених фајлова са 82 додато и 31 уклоњено
  1. 1 1
      public/static/weather/index.html
  2. 11 0
      src/utils/api.js
  3. 38 13
      src/views/BioSafety/BioSafety.vue
  4. 32 17
      src/views/Home/Home.vue

+ 1 - 1
public/static/weather/index.html

@@ -108,7 +108,7 @@
       ]
     }
     $.ajax({
-      url: `http://115.238.57.190:8100/produce/weather/info?farmId=${farmId}`,
+      url: `http://120.27.234.126:8010/produce/weather/info?farmId=${farmId}`,
       type: 'POST',
       headers: {
         accessToken: token

+ 11 - 0
src/utils/api.js

@@ -268,3 +268,14 @@ export function getCarWashVideo(params) {
   })
 }
 
+
+
+/** 首页生物安全 **/
+export function getAlarmAndPig(params) {
+  return axios({
+    url: '/produce/screen/index/dataList',
+    method: 'get',
+    params: params
+  })
+}
+

+ 38 - 13
src/views/BioSafety/BioSafety.vue

@@ -8,21 +8,23 @@
           <div class="bio-title-right"></div>
         </div>
         <div class="bio-video">
-          <div class="kuang"></div>
+          <div class="kuang">
+            <iframe  :src="'static/jinm/index.html?'+'1'+','+ cameraOne +','+ cameraTwo + ',' +'100%' + ',' + '0'" style="width: 95%; height: 100%;" frameborder="0"  allowfullscreen="true"></iframe>
+          </div>
         </div>
         <div class="bio-out">
           <div class="bio-out-center">
             <div class="out-img"></div>
             <div style="color: white; font-size: 16px">
-              <p>违规次数</p>
-              <p style="font-size: 22px; font-weight: 600">27</p>
+              <p>今日抓取次数</p>
+              <p style="font-size: 22px; font-weight: 600">{{pig.tadayGate}}</p>
             </div>
           </div>
           <div class="bio-out-center">
             <div class="out-img"></div>
             <div style="color: white; font-size: 16px">
-              <p>违规次数</p>
-              <p style="font-size: 22px; font-weight: 600">27</p>
+              <p>七日抓取次数</p>
+              <p style="font-size: 22px; font-weight: 600">{{pig.SevenDayGate}}</p>
             </div>
           </div>
         </div>
@@ -38,18 +40,18 @@
             <div class="box">
               <div class="circle"></div>
               <div class="price">
-                <strong class="price-size">15.2</strong>
-                <span>分钟</span>
+                <strong class="price-size">{{pig.carPassIn}}</strong>
+                <span></span>
               </div>
-              <div class="text">平均洗消时长</div>
+              <div class="text">今日驶入</div>
             </div>
             <div class="box">
               <div class="circle"></div>
               <div class="price">
-                <strong class="price-size">15.2</strong>
-                <span>分钟</span>
+                <strong class="price-size">{{pig.carPassOut}}</strong>
+                <span></span>
               </div>
-              <div class="text">平均熏蒸时长</div>
+              <div class="text">今日驶出</div>
             </div>
           </div>
           <div class="bio-content-right"
@@ -313,7 +315,7 @@
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/css/swiper.css'
 import ChartBar from "@/views/BioSafety/chart/ChartBar";
-import {getCar, getRecord, getSizhu, getCarList, getPersonList, getFaceToken, getSizhuList, getHoure, getDoor, getCarWashVideo} from "@/utils/api";
+import {getCar, getRecord, getSizhu, getCarList, getPersonList, getFaceToken, getSizhuList, getHoure, getDoor, getCarWashVideo, getAlarmAndPig} from "@/utils/api";
 import axios from "axios";
 import {timeDate} from "@/utils";
 
@@ -388,7 +390,21 @@ export default {
       enterPerson: '',
       outPerson: '',
       rtsp: '',
-      selectItems: {}
+      selectItems: {},
+      pig: {
+        SevenDaySiZhu: "",
+        SevenDayXIxiao: "",
+        carPassIn: "",
+        carPassOut: "",
+        personPassFail: "",
+        personPassSuccess: "",
+        tadaySiZhu: "",
+        tadayXiXiao: "",
+        SevenDayGate: '',
+        tadayGate: '',
+      },
+      cameraOne: 'ws://36.26.62.70:9080/camera_relay?tcpaddr=admin%3Ahmkj6688%40172.16.3.180',
+      cameraTwo: 'rtsp://admin:hmkj6688@172.16.3.180/cam/realmonitor?channel=1&subtype=0',
     }
   },
   methods: {
@@ -560,6 +576,13 @@ export default {
         }
       })
 
+      // 今日车辆驶入
+      getAlarmAndPig({}).then(res => {
+        if(res.code === 0) {
+          this.pig = res.data;
+        }
+      })
+
     },
     // 打开img
     open(item, num) {
@@ -637,6 +660,8 @@ export default {
     height: 100%;
     background: url("../../assets/BioSafety/kuang.png") no-repeat;
     background-size: 100% 100%;
+    box-sizing: border-box;
+    padding: 20px;
   }
   .bio-out {
     width: 100%;

+ 32 - 17
src/views/Home/Home.vue

@@ -46,11 +46,11 @@
           <div class="case-content">
             <div class="case-one">
               <span style=" padding-left: 20px;padding-right: 50px">正常</span>
-              <span><strong class="sign">79</strong>人次</span>
+              <span><strong class="sign">{{pig.personPassSuccess}}</strong>人次</span>
             </div>
             <div class="case-one">
               <span style=" padding-left: 20px; padding-right: 50px">异常</span>
-              <span><strong class="sign">79</strong>人次</span>
+              <span><strong class="sign">{{pig.personPassFail}}</strong>人次</span>
             </div>
           </div>
         </div>
@@ -58,25 +58,25 @@
           <div class="case-title">车辆管控</div>
           <div class="case-content">
             <div class="case-one">
-              <span style="padding-left: 20px; padding-right: 50px">洗消次数</span>
-              <span><strong class="sign">19</strong>次</span>
+              <span style="padding-left: 20px; padding-right: 50px">车辆驶入</span>
+              <span><strong class="sign">{{pig.carPassIn}}</strong>次</span>
             </div>
             <div class="case-one">
-              <span style="padding-left: 20px; padding-right: 50px">平均时常</span>
-              <span><strong class="sign">34</strong>分钟</span>
+              <span style="padding-left: 20px; padding-right: 50px">车辆驶出</span>
+              <span><strong class="sign">{{pig.carPassOut}}</strong>次</span>
             </div>
           </div>
         </div>
         <div class="case-center">
-          <div class="case-title">熏蒸监管</div>
+          <div class="case-title">车辆洗消</div>
           <div class="case-content">
             <div class="case-one">
-              <span style="padding-left: 20px; padding-right: 50px">熏蒸次数</span>
-              <span><strong class="sign">4</strong>次</span>
+              <span style="padding-left: 20px; padding-right: 50px">今日洗消</span>
+              <span><strong class="sign">{{pig.tadayXiXiao}}</strong>次</span>
             </div>
             <div class="case-one">
-              <span style="padding-left: 20px; padding-right: 50px">平均时常</span>
-              <span><strong class="sign">3.4</strong>小时</span>
+              <span style="padding-left: 20px; padding-right: 50px">七日洗消</span>
+              <span><strong class="sign">{{pig.SevenDayXIxiao}}</strong>次</span>
             </div>
           </div>
         </div>
@@ -84,12 +84,12 @@
           <div class="case-title">死猪监管</div>
           <div class="case-content">
             <div class="case-one">
-              <span style="padding-right: 40px">抓取次数</span>
-              <span><strong class="sign">79</strong>人次</span>
+              <span style="padding-right: 30px">今日抓取</span>
+              <span><strong class="sign">{{pig.tadaySiZhu}}</strong>次</span>
             </div>
             <div class="case-one">
-              <span style=" padding-right: 40px">最近抓取</span>
-              <span><strong class="sign">07/01</strong></span>
+              <span style=" padding-right: 30px">七日抓取</span>
+              <span><strong class="sign">{{pig.SevenDaySiZhu}}</strong>次</span>
             </div>
           </div>
         </div>
@@ -261,7 +261,7 @@
 </template>
 
 <script>
-import {getScreen, getListLargeScreen, getEnvList} from "@/utils/api";
+import {getScreen, getListLargeScreen, getEnvList, getAlarmAndPig} from "@/utils/api";
 
 export default {
   name: "Home",
@@ -316,7 +316,17 @@ export default {
       currentTime: new Date(),
       env: {},
       pro: {},
-      envList: {}
+      envList: {},
+      pig: {
+        SevenDaySiZhu: "",
+        SevenDayXIxiao: "",
+        carPassIn: "",
+        carPassOut: "",
+        personPassFail: "",
+        personPassSuccess: "",
+        tadaySiZhu: "",
+        tadayXiXiao: "",
+      }
     }
   },
   methods: {
@@ -341,6 +351,11 @@ export default {
           }
         }
       })
+      getAlarmAndPig({}).then(res => {
+        if(res.code === 0) {
+          this.pig = res.data;
+        }
+      })
     },
     prev() {
       if(this.num > 0) {