1、一脸通今日数据统计

src/api/estate/serveruser.js

@@ -48,10 +48,14 @@ export const update = (row) => {
   })
 }
 
-export const serverUserStat = () => {
+export const serverUserStat = (beginDate, endDate) => {
   return request({
     url: '/api/cyzh-estate/serveruser/serverUserStat',
     method: 'get',
+    params: {
+      beginDate,
+      endDate
+    }
   })
 }
 
@@ -66,4 +70,4 @@ export const getServerXFList = (current,size,params) => {
       size,
     }
   })
-}
+}

src/api/person/houseuser.js

@@ -44,7 +44,7 @@ export const delFace = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/cyzh-person/houseuser/submit',
+    url: '/api/cyzh-person/houseuser/save',
     method: 'post',
     data: row
   })
@@ -52,9 +52,20 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/cyzh-person/houseuser/submit',
+    url: '/api/cyzh-person/houseuser/update',
     method: 'post',
     data: row
   })
 }
 
+export const houseUserStat = (beginDate, endDate) => {
+  return request({
+    url: '/api/cyzh-person/houseuser/houseUserStat',
+    method: 'get',
+    params: {
+      beginDate,
+      endDate
+    }
+  })
+}
+

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

@@ -26,20 +26,11 @@
 
 <script>
   import countTo from 'vue-count-to';
-  import {
-    staffStat
-  } from "@/api/enterprise/staff";
-  import {
-    guestStat
-  } from "@/api/estate/guestrecord";
-  import {
-    getTemperatureAnomaliesCount
-  } from "@/api/estate/snaprecord";
-
-
-  import {
-    serverUserStat
-  } from "@/api/estate/serveruser";
+  import {staffStat} from "@/api/enterprise/staff";
+  import {guestStat} from "@/api/estate/guestrecord";
+  import {houseUserStat} from "@/api/person/houseuser";
+  import {getTemperatureAnomaliesCount} from "@/api/estate/snaprecord";
+  import {serverUserStat} from "@/api/estate/serveruser";
   import staffOption from "@/views/enterprise/option/staffOption.js"
   import guestOptionYq from "@/views/estate/guestmng/option/guestOption-yq.js"
   import guestOptionSq from "@/views/estate/guestmng/option/guestOption-sq.js"
@@ -131,9 +122,9 @@
         this.$refs.crud.rowAdd();
       },
       loadStat(beginDate, endDate) {
-        // staffStat().then(res => {
-        //   this.list[0].num = res.data.data;
-        // });
+        houseUserStat(null, null).then(res => {
+          this.list[0].num = res.data.data;
+        });
         guestStat(null, null).then(res => {
           this.list[1].num = res.data.data;
         });

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

@@ -91,7 +91,8 @@
       </div>
       <!-- 占位 -->
       <span style="background-color:transparent;" class="box-card" v-if="lastShow(6)"
-        v-for="(item, index) in lastList(6)" :key="index"></span>
+        v-for="(item, index) in lastList(6)" :key="index">
+      </span>
     </div>
 
     <!-- 抓拍记录 -->

src/views/smartaccess/form/houseuser.vue

@@ -30,8 +30,9 @@
   import {
     remove,
     update,
+    add,
     pushUserFace,
-  } from "@/api/enterprise/staff";
+  } from "@/api/person/houseuser";
   import {
     pushFace,
     deleteFace,
@@ -170,12 +171,13 @@
                   prop: "residentialId",
                   type: "select",
                   overHidden: true,
+                  cascaderItem: ['buildingId'],
                   dicUrl: '/api/cyzh-community/residential/list?size=100&agencyId={{key}}',
                   dicFormatter: (res) => {
                     return res.data.records;
                   },
                   props: {
-                    label: "residentialName",
+                    label: "name",
                     value: "id"
                   },
                   dataType: "string",
@@ -191,12 +193,13 @@
                   prop: "buildingId",
                   type: "select",
                   overHidden: true,
+                  cascaderItem: ['unitId'],
                   dicUrl: '/api/cyzh-community/building/list?size=100&residentialId={{key}}',
                   dicFormatter: (res) => {
                     return res.data.records;
                   },
                   props: {
-                    label: "buildingName",
+                    label: "name",
                     value: "id"
                   },
                   dataType: "string",
@@ -212,12 +215,13 @@
                   prop: "unitId",
                   type: "select",
                   overHidden: true,
+                  cascaderItem: ['roomId'],
                   dicUrl: '/api/cyzh-community/unit/list?size=100&buildingId={{key}}',
                   dicFormatter: (res) => {
                     return res.data.records;
                   },
                   props: {
-                    label: "unitName",
+                    label: "name",
                     value: "id"
                   },
                   dataType: "string",
@@ -254,12 +258,12 @@
                   prop: "roomId",
                   type: "select",
                   overHidden: true,
-                  dicUrl: '/api/cyzh-community/floor/list?size=100&floorId={{key}}',
+                  dicUrl: '/api/cyzh-community/room/list?size=100&unitId={{key}}',
                   dicFormatter: (res) => {
                     return res.data.records;
                   },
                   props: {
-                    label: "roomName",
+                    label: "name",
                     value: "id"
                   },
                   dataType: "string",
@@ -745,20 +749,33 @@
       submit(form, done) {
         let data = deepClone(form)
         if (this.isAdd) {
-          data.id = ''
-        }
-        update(data).then(() => {
-          done();
-          this.dialogShow = false;
-          this.$refs.avueForm.resetForm();
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+          data.id = '';
+          add(data).then(() => {
+            done();
+            this.dialogShow = false;
+            this.$refs.avueForm.resetForm();
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$emit('reloadData')
+          }, error => {
+            window.console.log(error);
           });
-          this.$emit('reloadData')
-        }, error => {
-          window.console.log(error);
-        });
+        }else{
+          update(data).then(() => {
+            done();
+            this.dialogShow = false;
+            this.$refs.avueForm.resetForm();
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$emit('reloadData')
+          }, error => {
+            window.console.log(error);
+          });
+        }
       },
       rowDel(id) {
         this.$confirm("确定删除该条数据?", {