1、统一人脸图片字段，审核字段

src/api/person/houseuser.js

@@ -0,0 +1,60 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const delFace = (ids) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/delFace',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/views/dashboard/onefaceaccess/comps/function_list.vue

@@ -36,7 +36,7 @@
     getTemperatureAnomaliesCount
   } from "@/api/estate/snaprecord";
 
-  
+
   import {
     serverUserStat
   } from "@/api/estate/serveruser";
@@ -59,7 +59,7 @@
 
         },
         list: [{
-            name: '常驻人员',
+            name: '常住人员',
             num: 0,
             bg: '/img/face/cz_bg.png',
             icon: '/img/face/cz.png',

src/views/dashboard/onefaceaccess/comps/resident.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page" style="box-sizing: border-box;position: relative;">
-    <more title="常驻人员" reload @reload="reload"></more>
+    <more title="常住人员" reload @reload="reload"></more>
 
     <div style="position: absolute;right: 40px;bottom: 6px;z-index: 999;" v-show="!loading">
       <el-pagination @current-change="currentChange" small layout="prev, pager, next" :page-count="page.pages">
@@ -92,7 +92,7 @@
       showDetail(item) {
         let params = {
           style: 'height: 58%;width: 38%;',
-          title: '常驻人员',
+          title: '常住人员',
           type: 'visitor',
           content: item,
           time: item.createTime

src/views/dashboard/smartoperationcenter/comps/access_records.vue

@@ -3,7 +3,7 @@
     <more title="通行统计" reload @reload="loadRecords(true)"></more>
     <div class="area">
       <div class="area1">日期</div>
-      <div class="area2">常驻人员</div>
+      <div class="area2">常住人员</div>
       <div class="area3">访客</div>
       <div class="area4">车辆</div>
     </div>

src/views/smartaccess/comps/face-card.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="bottom">
           <el-button @click="addBtnFunc" round size="medium" style="width:60%" icon="el-icon-plus">
-            <span v-if="$isEmpty(menuObj.index)">新增常驻人员</span>
+            <span v-if="$isEmpty(menuObj.index)">新增常住人员</span>
             <span v-if="menuObj.index==1">新增来访人员</span>
             <span v-if="menuObj.index==2">新增服务人员</span>
           </el-button>
@@ -27,12 +27,12 @@
           <!--人脸信息-->
           <div class="face-top">
             <div style="display: flex">
-              <el-image class="img" fit="cover" @error="item.imgError=true" :src="handeData(item).img">
+              <el-image class="img" fit="cover" @error="item.imgError=true" :src="handleData(item).img">
                 <img slot="error" class="img"
                   src="https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"></img>
               </el-image>
               <div class="center name">
-                {{handeData(item).name}}
+                {{handleData(item).name}}
               </div>
             </div>
             <div class="center" @click.stop="">
@@ -49,11 +49,11 @@
           </div>
           <!--公司-->
           <div class="face-center">
-            <div class="company">
-              {{handeData(item).content}}
+            <div class="address">
+              {{handleData(item).content}}
             </div>
             <div class="time">
-              {{item.createTime}} 加入
+              {{item.createTime}} 创建
             </div>
           </div>
           <!--底部-->
@@ -83,7 +83,7 @@
 
             <div v-else-if="handelStatus(item).txt == '审核不通过'" class="text-cut"
               style="font-size:12px;color:#999;width:70%;text-align: right">
-              {{handeData(item).opinion}}
+              {{handleData(item).opinion}}
             </div>
 
           </div>
@@ -203,7 +203,12 @@
   import dateTime from "@/util/dateTime.js"
   import {
     deleteFace
-  } from "@/api/estate/useraccesspermissions.js"
+  } from "@/api/estate/useraccesspermissions.js";
+  import {
+    getList as getHouserUserList,
+    getHouseUserXFList
+  } from "@/api/person/houseuser";
+  import {mapGetters} from "vuex";
   export default {
     name: "face-card",
     components: {
@@ -271,6 +276,7 @@
       }
     },
     computed: {
+      ...mapGetters(["tenantType"]),
       pushStatus() {
         return id => {
           if (this.pushIds.includes(id)) {
@@ -292,7 +298,7 @@
           return len % column > 0;
         }
       },
-      handeData() {
+      handleData() {
         return data => {
           let obj = {
             img: '',
@@ -304,15 +310,20 @@
           switch (index) {
             case 0:
               //下发人脸所需
-              data.userFace = data.face
-              obj.img = data.face
-              obj.name = data.realName
-              obj.opinion = data.auditOpinion
-              obj.content = data.enterpriseName || '暂无企业信息'
+              data.userFace = data.faceUrl
+              obj.img = data.faceUrl
+              obj.opinion = data.auditOpinion;
+              if(this.tenantType == 0){
+                obj.name = data.name
+                obj.content = data.liveAddress || '暂无房屋信息'
+              }else{
+                obj.name = data.realName
+                obj.content = data.enterpriseName || '暂无企业信息'
+              }
               break;
             case 1:
-              data.userFace = data.imageUri
-              obj.img = data.imageUri
+              data.userFace = data.faceUrl;
+              obj.img = data.faceUrl
               obj.name = data.guestName
               obj.opinion = data.opinion
               obj.content = data.enterpriseName ? '拜访【' + data.enterpriseName + '】' : '暂无拜访企业信息'
@@ -322,7 +333,7 @@
               obj.img = data.faceUrl
               obj.name = data.name
               obj.opinion = data.remark ? '备注：' + data.remark : ''
-              obj.content = data.agencyName || '暂无所在园区信息'
+              obj.content = data.agencyName || '暂无所在社区信息'
               break;
             default:
               break;
@@ -336,13 +347,13 @@
           let index = this.menuObj.index || 0
           //常驻人员和拜访人员显示审核状态
           if (index == 0 || index == 1) {
-            if (data.auditStatus == 0 || data.checkState == 0) {
+            if (data.auditStatus == 0) {
               obj.txt = '待审核'
               obj.color = '#ff9900'
-            } else if (data.auditStatus == 1 || data.checkState == 1) {
+            } else if (data.auditStatus == 1) {
               obj.txt = '审核通过'
               obj.color = '#19be6b'
-            } else if (data.auditStatus == 2 || data.checkState == 2) {
+            } else if (data.auditStatus == 2) {
               obj.txt = '审核不通过'
               obj.color = '#fa3534'
             }
@@ -514,7 +525,12 @@
         if (index == 0) {
           //常驻人员
           this.size = 17;
-          this.getStaffList(params);
+          if(this.tenantType == 0){
+            //社区常住人员列表
+            this.getHouseUserList(params);
+          }else{
+            this.getStaffList(params);
+          }
         } else if (index == 1) {
           //来访人员
           this.size = 17;
@@ -631,6 +647,25 @@
         this.list = data.records
         this.pageCount = data.pages
         this.loading = false
+      },
+      //获取常驻人员数据列表
+      async getHouseUserList(params) {
+        let data = {}
+        let index = this.statusObj.index
+        if (index == 4 || index == 5) {
+          params.type = this.statusObj.value
+          data = (await getHouseUserXFList(this.current, this.size, params)).data.data
+          data.records.forEach(item => {
+            //下发状态
+            item.pushStatus = this.statusObj.value
+          })
+        } else {
+          params.auditStatus = this.statusObj.value
+          data = (await getHouserUserList(this.current, this.size, params)).data.data
+        }
+        this.list = data.records
+        this.pageCount = data.pages
+        this.loading = false
       }
     }
 
@@ -753,7 +788,7 @@
 
       .name {
         margin-left: 10px;
-        font-size: 14px;
+        font-size: 12px;
         font-family: Microsoft YaHei;
         font-weight: bold;
         color: #282D30;
@@ -766,8 +801,8 @@
       text-align: left;
       height: 50%;
 
-      .company {
-        font-size: 14px;
+      .address {
+        font-size: 12px;
         font-family: Microsoft YaHei;
         font-weight: 400;
         color: #333333;

src/views/smartaccess/comps/menu-list.vue

@@ -52,7 +52,7 @@
 
         menuIndex: 0,
         menuList: [{
-            name: '常驻人员',
+            name: '常住人员',
             index: 0
           },
           {