Merge remote-tracking branch 'origin/V1' into V1

web/src/main/resources/templates/listOfPeople.html

@@ -11,23 +11,21 @@
         <div class="container" id="app" style="display:flex;flex-direction:column;">
             <div class="page__hd">
                 <h1 class="page__title" th:text="${device.aliasName}"></h1>
-                <p class="page__desc">人员列表</p>
+                <p class="page__desc">{{libName}}&gt;人员列表</p>
                 <div class="right-corner">
                     <a class="weui-btn weui-btn_mini weui-btn_default" @click="gotoPeopleLibList()">返回</a>
                 </div>
             </div>
             <div>
-                <div class="weui-cells__group weui-cells__group_form">
-                    <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell weui-cell_active">
-                            <div class="weui-cell__bd">
-                                <input class="weui-input" placeholder="查询编号" v-model="personId">
-                            </div>
-                            <div class="weui-cell__ft">
-                                <a class="weui-btn weui-btn_mini weui-btn_primary" @click="pageSearch()">
-                                    <i class="weui-loading" v-show="loading"></i>查询
-                                </a>
-                            </div>
+                <div class="weui-cells">
+                    <div class="weui-cell weui-cell_active">
+                        <div class="weui-cell__bd">
+                            <input class="weui-input" placeholder="查询编号" v-model="personId">
+                        </div>
+                        <div class="weui-cell__ft">
+                            <a class="weui-btn weui-btn_mini weui-btn_primary" @click="pageSearch(0)">
+                                <i class="weui-loading" v-show="loading"></i>查询
+                            </a>
                         </div>
                     </div>
                 </div>
@@ -36,7 +34,9 @@
                 <a class="weui-cell"  v-for="(person,index) in list">
                     <div class="weui-cell__hd" style="width:60px;">
                         <div style="border-radius:50%;width:48px;height:48px;overflow:hidden;">
-                            <img :src="'data:image/png;base64,' + person.ImageList[0].Data" style="object-fit:cover;" width="48" height="48"/>
+                            <template v-if="person.ImageList.length>0">
+                                <img :src="'data:image/png;base64,' + person.ImageList[0].Data" style="object-fit:cover;" width="48" height="48"/>
+                            </template>
                         </div>
                     </div>
                     <div class="weui-cell__bd">
@@ -63,6 +63,7 @@
             var path = [[${#httpServletRequest.contextPath}]];
             var device = [[${device}]];
             var libId = [[${param.libId}]][0];
+            var libName = [[${param.libName}]][0];
         </script>
         <script type="text/javascript">
             var vm = new Vue({
@@ -70,6 +71,7 @@
                 data : {
                     list: [],
                     className: "",
+                    libName: libName,
                     token:$.cookie('devOpsToken'),
                     loading: false,
                     personId: "",
@@ -81,7 +83,7 @@
                     gotoPeopleLibList(){
                         window.location.href = path + "/devOps/listOfPeopleLib?deviceId=" + device.id;
                     },
-                    pageSearch() {
+                    pageSearch(index) {
                         var self = this;
                         self.loading = true;
 
@@ -89,7 +91,7 @@
                             deviceNo : device.deviceNo,
                             libId : libId,
                             qryType: "27",
-                            offset: this.offset,
+                            offset: index,
                             limit: this.limit,
                             qryData: this.personId
                         },
@@ -97,6 +99,7 @@
                             self.loading = false;
 
                             if(rs.result){
+                                self.offset = index;
                                 self.list = rs.data.Response.Data.PersonList.PersonInfoList;
                                 self.total = rs.data.Response.Data.Total;
                             }else{
@@ -120,8 +123,8 @@
                             },
                             function(rs){
                                 if(rs.result){
-                                    self.delayAlert(rs.message);
-                                    self.pageSearch();
+                                    self.delayAlert("删除成功!");
+                                    self.pageSearch(self.offset);
                                 }else{
                                     self.delayAlert(rs.message);
                                 }
@@ -129,28 +132,24 @@
                         }, null);
                     },
                     first() {
-                        this.offset = 0;
-                        this.pageSearch();
+                        this.pageSearch(0);
                     },
                     prev() {
                         if(this.offset>0){
-                            this.offset -= this.limit;
-                            this.pageSearch();
+                            this.pageSearch(this.offset - this.limit);
                         }
                     },
                     next() {
                         if(this.offset + this.limit<this.total){
-                            this.offset += this.limit;
-                            this.pageSearch();
+                            this.pageSearch(this.offset + this.limit);
                         }
                     },
                     last() {
-                        this.offset = this.total - this.limit;
-                        this.pageSearch();
+                        this.pageSearch(this.total - this.limit);
                     },
                 },
                 mounted: function() {
-                    this.pageSearch();
+                    this.pageSearch(0);
                 }
             });
         </script>

web/src/main/resources/templates/listOfPeopleLib.html

@@ -24,6 +24,7 @@
                 <a class="weui-cell  weui-cell_access" @click="gotoPeopleList(item)"  v-for="(item,index) in list">
                     <div class="weui-cell__bd">
                         <p v-html="item.Name"></p>
+                        <small v-html="'人员数：' + item.FaceNum"></small>
                     </div>
                     <div class="weui-cell__ft"></div>
                 </a>
@@ -51,7 +52,7 @@
                         window.location.href = path + "/devOps/listOfDevice";
                     },
                     gotoPeopleList(lib){
-                        window.location.href = path + "/devOps/listOfPeople?deviceId=" + device.id + "&libId=" + lib.ID;
+                        window.location.href = path + "/devOps/listOfPeople?deviceId=" + device.id + "&libId=" + lib.ID + "&libName=" + encodeURIComponent(lib.Name);
                     },
                     pageSearch() {
                         var self = this;