From 73c423a9eb390a41242331df97a27a6760938237 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 03 九月 2020 18:15:07 +0800
Subject: [PATCH] 添加人脸抓拍测试
---
src/pages/faceCapture/index/main.ts | 11 +++
src/pages/desktop/index/components/DFrame.vue | 79 ++++++++++++-------------
src/pages/faceCapture/index/App.vue | 59 +++++++++++++++++++
src/pages/desktop/index/mock/userData.json | 11 +++
src/pages/library/components/personList.vue | 10 +-
src/pages/faceCapture/index/api.ts | 9 +++
6 files changed, 133 insertions(+), 46 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 316ba97..2df51c1 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -29,7 +29,7 @@
</div>
<div class="d-frame-content">
<div class="iframe-mask" v-if="data.order!=1" @click="frameClick"></div>
- <iframe :src="data.url" v-if="data.url" :name="data.name" ></iframe>
+ <iframe :src="data.url" v-if="data.url" :name="data.name"></iframe>
<div v-html="data.html" v-if="data.html"></div>
<!-- <span class="d-frame-operation-resize" v-resize></span> -->
<span
@@ -77,32 +77,31 @@
}
},
watch: {
- showMenu(val){
- if(val){
- document.body.addEventListener('click',this.closeMenuList)
- }else{
- document.body.removeEventListener('click',this.closeMenuList)
+ showMenu(val) {
+ if (val) {
+ document.body.addEventListener('click', this.closeMenuList)
+ } else {
+ document.body.removeEventListener('click', this.closeMenuList)
}
}
},
- mounted(){
+ mounted() {
console.log(document.querySelectorAll('iframe'))
- window.addEventListener('message',(d)=>{
- let {source,trigger,menuT,menuL} = d.data;
- debugger
- if(trigger == 'contextmenu'){
- this.openMenuList(menuT,menuL)
+ window.addEventListener('message', (d) => {
+ let { source, trigger, menuT, menuL } = d.data;
+ if (trigger == 'contextmenu') {
+ this.openMenuList(menuT, menuL)
}
});
-
+
},
methods: {
- openMenuList(t,l,frame){
+ openMenuList(t, l, frame) {
this.showMenu = true;
this.menuTop = t;
this.menuLeft = l;
},
- closeMenuList(){
+ closeMenuList() {
this.showMenu = false;
},
//resize
@@ -122,7 +121,7 @@
e.preventDefault();
let curWidth = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
let curHeight = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
-
+
this.width = curWidth;
this.height = curHeight;
}.bind(this)
@@ -137,11 +136,10 @@
window.frames[this.data.name].location.reload()
},
closeFrame: function () {
- debugger
this.$store.dispatch('desktop/closeFrame', this.data);
//this.refreshDock();
this.$store.commit('desktop/highlight')
-
+
},
changeFullScreen: function () {
this.fullScreen = !this.fullScreen;
@@ -150,17 +148,17 @@
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
-
+
//if(data.name=='cameraVideo'||data.name=='search'||data.name=='library'||data.name=='cameraAccess'||data.name=='dataStack'){
- //let shotSrc = canvas.toDataURL();
- this.$store.commit('desktop/addMinDock', {
- id: this.data.id,
- src: this.data.icon,
- alt: this.data.title,
- type: "3",
- //screenshot: shotSrc
- });
- return false;
+ //let shotSrc = canvas.toDataURL();
+ this.$store.commit('desktop/addMinDock', {
+ id: this.data.id,
+ src: this.data.icon,
+ alt: this.data.title,
+ type: "3",
+ //screenshot: shotSrc
+ });
+ return false;
//}
//鎵惧埌褰撳墠鐨刬frame
//let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
@@ -192,9 +190,9 @@
// });
// });
//return false;
-
+
},
-
+
},
directives: {
drag(el) {
@@ -213,10 +211,10 @@
let toLeft = e.clientX - disx;
let toTop = e.clientY - disy;
//杈圭晫澶勭悊
- if (toLeft <= -(el.parentElement.offsetWidth-46*3)) {
- toLeft = -(el.parentElement.offsetWidth-46*3)
- } else if (toLeft >= document.body.getBoundingClientRect().width - 46*3) {
- toLeft = document.body.getBoundingClientRect().width - 46*3;
+ if (toLeft <= -(el.parentElement.offsetWidth - 46 * 3)) {
+ toLeft = -(el.parentElement.offsetWidth - 46 * 3)
+ } else if (toLeft >= document.body.getBoundingClientRect().width - 46 * 3) {
+ toLeft = document.body.getBoundingClientRect().width - 46 * 3;
}
el.parentElement.style.left = toLeft + 'px';
if (toTop <= 40) {
@@ -267,7 +265,7 @@
}
.d-frame {
position: fixed;
- box-shadow: 0 5px 10px rgba(0,0,0,.5);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);
}
.d-frame.d-frame-full {
@@ -285,9 +283,8 @@
border-top: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
-
}
-.iframe-mask{
+.iframe-mask {
position: absolute;
top: 30px;
left: 0;
@@ -385,7 +382,7 @@
cursor: nwse-resize;
background: url("/images/desktop/resize.png") no-repeat;
}
-.menuList{
+.menuList {
background: #fff;
position: absolute;
z-index: 100;
@@ -393,13 +390,13 @@
text-align: left;
border: 1px solid #ccc;
}
-.menuList li{
+.menuList li {
line-height: 28px;
height: 28px;
padding-left: 24px;
background: #fff;
}
-.menuList li:hover{
- background: rgba(152, 170, 190,.7);
+.menuList li:hover {
+ background: rgba(152, 170, 190, 0.7);
}
</style>
\ No newline at end of file
diff --git a/src/pages/desktop/index/mock/userData.json b/src/pages/desktop/index/mock/userData.json
index 1ef5859..3a1cc99 100644
--- a/src/pages/desktop/index/mock/userData.json
+++ b/src/pages/desktop/index/mock/userData.json
@@ -156,6 +156,17 @@
"title": "鎽勫儚鏈哄尯鍩熺鐞�",
"width": 1200,
"height": 600
+ },
+ {
+ "id": "21",
+ "name": "faceCapture",
+ "src": "../../images/app-mid/device.png",
+ "alt": "浜鸿劯鎶撴媿娴嬭瘯",
+ "type": "2",
+ "url": "/view/faceCapture",
+ "title": "浜鸿劯鎶撴媿娴嬭瘯",
+ "width": 1200,
+ "height": 600
}
]
}
diff --git a/src/pages/faceCapture/index/App.vue b/src/pages/faceCapture/index/App.vue
new file mode 100644
index 0000000..128b581
--- /dev/null
+++ b/src/pages/faceCapture/index/App.vue
@@ -0,0 +1,59 @@
+<template>
+ <div class="container">
+ <span>ip:</span>
+ <el-input v-model="ip" style="width:200px"></el-input>
+ <el-table :data="response" border>
+ <el-table-column label="鎶撴媿鍥�" width="160" align="center">
+ <template slot-scope="scope">
+ <div>
+ <img
+ v-if="scope.row.faceImg"
+ :src="`data:image/png;base64,`+scope.row.faceImg"
+ style="max-height:84px;width:84px;object-fit:contain;background:rgba(0,0,0,0.35);"
+ class="avatar"
+ />
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="faceId" label="faceId" align="center"></el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+import { capture } from './api'
+export default {
+ data() {
+ return {
+ ip: "",
+ response: []
+ }
+ },
+ mounted() {
+ this.getData()
+ },
+ methods: {
+ getData() {
+ if (this.ip.length) {
+ capture({ ip: this.ip }).then(rsp => {
+ if (rsp && rsp.rtnCode === '1') {
+ this.response.push(rsp.rtnData)
+ }
+ })
+ }
+
+ setTimeout(() => {
+ this.getData()
+ }, 1000)
+ }
+
+ }
+}
+</script>
+<style lang="scss">
+.container {
+ width: 100%;
+ height: 100%;
+ background: #e9ebf2;
+}
+</style>
diff --git a/src/pages/faceCapture/index/api.ts b/src/pages/faceCapture/index/api.ts
new file mode 100644
index 0000000..94462f5
--- /dev/null
+++ b/src/pages/faceCapture/index/api.ts
@@ -0,0 +1,9 @@
+import request from "@/scripts/httpRequest";
+
+export const capture = (data: any) => {
+ return request({
+ url: '/data/api-v/face/capture',
+ method: "post",
+ data
+ })
+}
diff --git a/src/pages/faceCapture/index/main.ts b/src/pages/faceCapture/index/main.ts
new file mode 100644
index 0000000..6bd5dc0
--- /dev/null
+++ b/src/pages/faceCapture/index/main.ts
@@ -0,0 +1,11 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import "@/assets/css/element-variables.scss";
+
+import App from './App.vue';
+Vue.use(ElementUI)
+new Vue({
+ el: '#app',
+ render: h => h(App)
+})
\ No newline at end of file
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index a1bf5be..b86297b 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -233,10 +233,10 @@
<el-table-column prop="startTime" label="寮�濮嬫椂闂�" align="center"></el-table-column>
<el-table-column prop="endTime" label="缁撴潫鏃堕棿" align="center"></el-table-column>
<el-table-column prop="stayTime" label="鍋滅暀鏃堕暱" width="99" align="center">
- <template slot-scope="scope">
- <span>{{scope.row.stayTime}} 绉� </span>
- </template>
- </el-table-column>
+ <template slot-scope="scope">
+ <span>{{scope.row.stayTime}} 绉� </span>
+ </template>
+ </el-table-column>
</el-table>
<p style="text-align:right; font-size: 14px;">鍏眥{faceDataCount}}鏉℃暟鎹�</p>
</el-dialog>
@@ -545,7 +545,7 @@
pageSize: 10,
total: 0,
orderType: "desc",
- orderName: "id",
+ orderName: "createTime",
contentValue: "",
visible: false,
selectedRowKeys: [],
--
Gitblit v1.8.0