From 5dc36d1e0ea55358eb5b7273943897a75403993c Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 13 八月 2020 17:26:09 +0800
Subject: [PATCH] 修复底库分页全屏不显示,场景编辑可选参数默认选中第一个operator,表单必填项红星对齐方式修改

---
 src/pages/library/components/personList.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 7194efd..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
@@ -188,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"
@@ -815,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

--
Gitblit v1.8.0