From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/library/components/personList.vue | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 4e75db3..6ade657 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -55,7 +55,7 @@
<el-col :span="2">
<div class="text-left">
<upload
- limitTypes=".jpg,.png,.jpeg,.gif,.mp4"
+ limitTypes=".jpg,.png,.jpeg"
limitSize
uploadBtntext="涓婁紶鐓х墖"
uploadBtnIcon
@@ -77,7 +77,6 @@
tooltip-effect="dark"
style="width: 100%;"
:fit="true"
- :max-height="tableHeight"
:default-sort="{prop: 'createTime', order: 'descending'}"
@selection-change="handleSelectionChange"
:header-cell-style="{background:'#f8f8f8',color:'#222222'}"
@@ -189,7 +188,7 @@
</el-table-column>
</el-table>
</div>
- <div class="pt5 pb20" style="height:40px;position:relative">
+ <div class="pt5 " style="height:40px;position:relative">
<el-pagination
@current-change="refrash"
:current-page="BaseManageData.page"
@@ -816,18 +815,33 @@
}
}
},
+ // tosearch(item) {
+ // // console.log("璺宠浆鍦板潃", item)
+ // var curWwwPath = window.document.location.href;
+ // var pathname = window.document.location.pathname;
+ // var pos = curWwwPath.indexOf(pathname);
+ // var localhostPath = curWwwPath.substring(0, pos); //ip+port
+ // var href = localhostPath + "/Layout/Searching"
+ // let captureId = item.id == "" ? item.personId : item.id
+ // var url = item.personPicUrl ? item.personPicUrl : item.personPicUrl
+ // // console.log("璺宠浆鍦板潃",href,"url",url)
+ // var compType = 0
+ // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType)
+ // },
tosearch(item) {
- // console.log("璺宠浆鍦板潃", item)
- var curWwwPath = window.document.location.href;
- var pathname = window.document.location.pathname;
- var pos = curWwwPath.indexOf(pathname);
- var localhostPath = curWwwPath.substring(0, pos); //ip+port
- var href = localhostPath + "/Layout/Searching"
+ //let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id
let captureId = item.id == "" ? item.personId : item.id
- var url = item.personPicUrl ? item.personPicUrl : item.personPicUrl
- // console.log("璺宠浆鍦板潃",href,"url",url)
- var compType = 0
- window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType)
+ let imgUrl = item.personPicUrl ? item.personPicUrl : item.personPicUrl
+ let compType = 1 // 鏁版嵁鏉ヨ嚜浜巈s
+ if (!item.id || item.id == "") {
+ compType = 0 // 鏁版嵁鏉ヨ嚜浜庡簳搴�
+ }
+ // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType)
+
+ let message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType;
+ window.parent.postMessage({
+ msg: message
+ }, "*")
},
copyClick(row) {
this.BaseManageData.personId = row.id
@@ -1032,6 +1046,12 @@
border-bottom: none;
// border-bottom: none;
}
+.el-dialog{
+ min-width: 515px;
+ .el-button--info{
+ color: #222;
+ }
+}
.el-dialog__header {
padding: 20px 0 10px;
text-align: left;
--
Gitblit v1.8.0