From d40f0071502682721e9172838894080f37c9a096 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 16 十月 2020 15:54:25 +0800
Subject: [PATCH] 本机详细信息显示字段更新

---
 src/pages/library/components/personList.vue |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 1d615ba..54eb6de 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -42,13 +42,13 @@
         <el-button size="small" type="primary" @click="handleSearch">鎼滅储</el-button>
       </el-col>
       <el-col :offset="11" :span="3">
-        <fTemplate authority="videoTable:edit">
+        <fTemplate authority="library:set">
           <el-button
             size="small"
             class="ml10"
             type="danger"
             @click="deleteBatch"
-            v-if="isShow('videoTable:edit')"
+            v-if="isShow('library:set')"
           >鎵归噺鍒犻櫎</el-button>
         </fTemplate>
       </el-col>
@@ -59,7 +59,7 @@
             limitSize
             uploadBtntext="涓婁紶鐓х墖"
             uploadBtnIcon
-            v-if="isShow('videoTable:edit')"
+            v-if="isShow('library:set')"
             uploadBtnSize="small"
             :isDrag="true"
             @addFilesBaBackFN="changeDialog"
@@ -135,7 +135,7 @@
             <el-switch
               v-model="scope.row.enable"
               :active-value="1"
-              :disabled="!isShow('videoTable:edit')"
+              :disabled="!isShow('library:set')"
               :inactive-value="0"
               @change="enable(scope.row)"
             ></el-switch>
@@ -143,7 +143,7 @@
         </el-table-column>
         <el-table-column label="鎿嶄綔" min-width="200" align="center">
           <template slot-scope="scope">
-            <fTemplate authority="videoTable:edit">
+            <fTemplate authority="library:set">
               <el-tooltip content="缂栬緫" placement="top" popper-class="atooltip">
                 <span
                   class="iconfont iconbianji iconStyle1"
@@ -158,7 +158,7 @@
             <el-tooltip content="鏌ョ湅璇︽儏" placement="top" popper-class="atooltip">
               <span class="iconfont iconsousuoren iconStyle1" @click="showDetail(scope.row)"></span>
             </el-tooltip>
-            <fTemplate authority="videoTable:edit">
+            <fTemplate authority="library:set">
               <el-tooltip content="澶嶅埗" placement="top" popper-class="atooltip">
                 <span
                   class="iconfont iconfuzhi iconStyle1"
@@ -167,7 +167,7 @@
                 ></span>
               </el-tooltip>
             </fTemplate>
-            <fTemplate authority="videoTable:edit">
+            <fTemplate authority="library:set">
               <el-tooltip content="绉诲姩" placement="top" popper-class="atooltip">
                 <span
                   class="iconfont iconyidongzhi iconStyle1"
@@ -177,7 +177,7 @@
                 ></span>
               </el-tooltip>
             </fTemplate>
-            <fTemplate authority="videoTable:edit">
+            <fTemplate authority="library:set">
               <el-tooltip content="鍒犻櫎" placement="top" popper-class="atooltip">
                 <span
                   class="iconfont iconshanchu iconStyle1"
@@ -219,15 +219,27 @@
         <el-button size="mini" type="primary" @click="postCameraData">鏌ヨ</el-button>
       </div>
 
-      <p class="member-info">
-        <label class="">浜哄憳淇℃伅:</label>
+      <div class="member-info">
+        <label class>浜哄憳淇℃伅:</label>
         <ul>
-          <li><span>濮撳悕:</span><span>{{memberInfo.personName}}</span></li>
-          <li><span>鎬у埆:</span><span>{{memberInfo.sex}}</span></li>
-          <li><span>韬唤璇佸彿:</span><span>{{memberInfo.idCard}}</span></li>
-          <li><span>鎰忓浘:</span><span>{{memberInfo.reserved}}</span></li>
+          <li>
+            <span>濮撳悕:</span>
+            <span>{{memberInfo.personName}}</span>
+          </li>
+          <li>
+            <span>鎬у埆:</span>
+            <span>{{memberInfo.sex}}</span>
+          </li>
+          <li>
+            <span>韬唤璇佸彿:</span>
+            <span>{{memberInfo.idCard}}</span>
+          </li>
+          <li>
+            <span>鎰忓浘:</span>
+            <span>{{memberInfo.reserved}}</span>
+          </li>
         </ul>
-      </p>
+      </div>
 
       <el-table :data="cameraDetailData" border>
         <el-table-column prop="faceImg" label="鎶撴媿瀹炴櫙" width="160" align="center">
@@ -531,7 +543,7 @@
 export default {
   data() {
     return {
-      timeRange: [new Date(2020, 7, 25, 8), new Date()],
+      timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23, 59, 59))],
       memberInfo: {
         personName: '',
         sex: '',
@@ -693,7 +705,7 @@
       console.log("hello");
     },
     getUploadResult(result) {
-      console.log(result, "涓婁紶鐨勮繑鍥�");
+      // console.log(result, "涓婁紶鐨勮繑鍥�");
       this.uploadResult = result.data;
       this.dialogVisible = true;
       this.getPersonList();
@@ -1277,6 +1289,7 @@
 }
 
 .avatar-uploader {
+  margin: auto;
   max-width: 150px;
   min-width: 150px;
   min-height: 152px;

--
Gitblit v1.8.0