From c7cf8e94cb56563ed4c6832c4dab249f1d2ff846 Mon Sep 17 00:00:00 2001
From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com>
Date: Mon, 19 Feb 2024 18:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC3.8.0=20=20ljd=20=202024-2-19?=
 =?UTF-8?q?=201=E3=80=81=E4=BF=AE=E5=A4=8D=E7=A7=9F=E5=AE=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=99=A8=E4=B8=8D=E7=AE=A1=E8=BE=93=E5=85=A5=E5=A4=9A?=
 =?UTF-8?q?=E5=B0=91=E9=A1=B5=E9=83=BD=E6=98=AF=E7=AC=AC=E4=B8=80=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=8C=E6=AC=A1=E6=90=9C=E7=B4=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=203=E3=80=81=E4=BF=AE=E6=94=B9=E7=A7=9F=E5=AE=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E6=97=B6=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DeviceFeedbackLog.vue | 13 +++++---
 src/views/DeviceFeedbackLog.vue      | 15 ++++++---
 src/views/doorLock.vue               | 11 ++++--
 src/views/getFinger.vue              |  7 ++--
 src/views/room.vue                   | 33 ++++++++++++++++--
 src/views/userManagement.vue         | 65 ++++++++----------------------------
 6 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/components/DeviceFeedbackLog.vue b/src/components/DeviceFeedbackLog.vue
index 9189090..68ca432 100644
--- a/src/components/DeviceFeedbackLog.vue
+++ b/src/components/DeviceFeedbackLog.vue
@@ -34,7 +34,8 @@
         <el-table-column prop="cardName" label="锁用户"></el-table-column>
         <el-table-column prop="operateName" label="操作员"></el-table-column>
         <el-table-column prop="serial" label="流水号"></el-table-column>
-        <el-table-column prop="createTime" label="生效时间"></el-table-column>
+        <el-table-column prop="updateTime" label="生效时间"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
       <!--  <el-table-column prop="createTime" label="操作" v-if="userInfo.type==0">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="cancelDistribution(scope.$index,scope.row)"
@@ -57,6 +58,7 @@
     httpPost
   } from "../api";
   import utils from "../utils/util.js";
+  import moment from "moment/moment";
   export default {
     inject: ['reload'],
     name: "warningLog",
@@ -189,7 +191,8 @@
           var AboutDevice = this.AboutDevice
           let datalist=utils.zlib_unzip(res.data)
           datalist.map((li) => {
-            li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             var resultArr = AboutDevice.filter(_item => _item.imei == li.imei)[0]
             li['statusText'] = utils.statusCode(li.result)
             if (resultArr) {
@@ -240,7 +243,8 @@
           datalist.map((li) => {
             li['statusText'] = utils.statusCode(li.result)
             var resultArr = AboutDevice.filter(_item => _item.imei == li.imei)[0]
-            li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             if (resultArr) {
               li.roomId = resultArr.id
               li.roomName = resultArr.roomName
@@ -281,7 +285,8 @@
           datalist.map((li) => {
             li['statusText'] = utils.statusCode(li.result)
             var resultArr = AboutDevice.filter(_item => _item.imei == li.imei)[0]
-            li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             if (resultArr) {
               li.roomId = resultArr.id
               li.roomName = resultArr.roomName
diff --git a/src/views/DeviceFeedbackLog.vue b/src/views/DeviceFeedbackLog.vue
index d72ff39..b432647 100644
--- a/src/views/DeviceFeedbackLog.vue
+++ b/src/views/DeviceFeedbackLog.vue
@@ -42,7 +42,8 @@
         <el-table-column prop="cardName" label="锁用户"></el-table-column>
         <el-table-column prop="operateName" label="操作员"></el-table-column>
         <el-table-column prop="serial" label="流水号"></el-table-column>
-        <el-table-column prop="createTime" label="生效时间"></el-table-column>
+        <el-table-column prop="updateTime" label="生效时间"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column prop="createTime" label="操作" v-if="userInfo.type==0">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="cancelDistribution(scope.$index,scope.row)"
@@ -696,7 +697,9 @@
             } else {
               li['reStatus'] = false
             }
-            li.createTime = this.time(+new Date(li.createTime));
+            // li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             var resultArr = this.AboutDevice.filter(_item => _item.imei == li.imei)[0]
             li['operationType'] = ''
             var operationType = this.DeviceFeedbackLog.filter(item => item.code == li.command)[
@@ -763,7 +766,9 @@
               }
             }
             li['statusText'] = utils.statusCode(li.result)
-            li.createTime = this.time(+new Date(li.createTime));
+            // li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             var resultArr = AboutDevice.filter(_item => _item.imei == li.imei)[0]
             if (resultArr) {
               li.roomId = resultArr.id
@@ -798,7 +803,9 @@
           dataOne.map((li) => {
             li['statusText'] = utils.statusCode(li.result)
             var resultArr = AboutDevice.filter(_item => _item.imei == li.imei)[0]
-            li.createTime = this.time(+new Date(li.createTime));
+            // li.createTime = this.time(+new Date(li.createTime));
+            li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss')
+            li.updateTime = moment(li.updateTime).format('YYYY-MM-DD HH:mm:ss')
             if ((li.command == 6204 || li.command == 6207 || li.command == 6210 || li
                 .command == 6213) && li.result == 702) {
               li['reStatus'] = true
diff --git a/src/views/doorLock.vue b/src/views/doorLock.vue
index 0f0072d..04135f9 100644
--- a/src/views/doorLock.vue
+++ b/src/views/doorLock.vue
@@ -330,7 +330,7 @@
       </el-table>
       <div class="pagination">
         <el-pagination @size-change="handleSizeChange" @current-change="handlePageChange"
-          :current-page="$store.state.currentPage" :page-sizes="[10, 20, 100]" :page-size="pageSize"
+          :current-page="normallyPageNum" :page-sizes="[10, 20, 100]" :page-size="pageSize"
           :layout="paginationConfig" :total="pageTotal">
         </el-pagination>
       </div>
@@ -3076,6 +3076,8 @@ restSearch() {
   }
   this.checkNodeId = ''
   this.searchRoom = ''
+  this.normallyPageNum = 1
+  this.pageSize = 10
   this.handleSearch()
 },
 // 设备状态统计筛选
@@ -3104,6 +3106,7 @@ screenStatisticsItemsMethods(data) {
 },
 // 触发搜索按钮
 handleSearch() {
+  this.normallyPageNum = 1
   var deviceNum = this.search.deviceNum.replace(/\s*/g, "");
   var imei = this.search.imei.replace(/\s*/g, "");
   if (this.search.isOnline == 2) {
@@ -3394,7 +3397,7 @@ saveEdit() {
   this.editVisible = false;
 },
 handleSizeChange(val) {
-  console.log(`每页 ${val} 条`);
+  this.normallyPageNum = 1
   this.$router.replace({
     path: this.$route.path,
     query: {
@@ -3403,7 +3406,8 @@ handleSizeChange(val) {
     },
   });
   this.pageSize = val
-  this.getlistNum(0, val);
+  // this.getlistNum(1, val);
+  this.handleSearch()
 },
 getlistNum(val, size) {
   var deviceNum = this.search.deviceNum.replace(/\s*/g, "");
@@ -3472,6 +3476,7 @@ handlePageChange(val) {
   //   },
   // });
   this.pageNum = val
+  this.normallyPageNum = val
   this.$store.commit("increment", val);
   var q = {
     deviceNum: this.search.deviceNum,
diff --git a/src/views/getFinger.vue b/src/views/getFinger.vue
index 7c1d31f..85681c7 100644
--- a/src/views/getFinger.vue
+++ b/src/views/getFinger.vue
@@ -438,9 +438,10 @@ function getLocalIp(cb){
 			openFullScreen() {
 				this.loading = this.$loading({
 					lock: true,
-					text: this.text,
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
+          text: 'Loading...'
+					// text: this.text,
+					// spinner: 'el-icon-loading',
+					// background: 'rgba(0, 0, 0, 0.7)'
 				});
 			}
 
diff --git a/src/views/room.vue b/src/views/room.vue
index 6efe3a0..aaa58ff 100644
--- a/src/views/room.vue
+++ b/src/views/room.vue
@@ -1224,7 +1224,7 @@ export default {
 				}
 			})
 		},
-		resetInput() {
+		async resetInput() {
 			this.input5 = ''
 			this.input6 = ''
 			this.searchSelectStatus = ''
@@ -1235,8 +1235,35 @@ export default {
 				address: '',
 				area: ''
 			}
-			this.queryfirstall();
-			this.getlistChildren(this.selectrow);
+      this.selectedOptionsData1 = []
+      this.input5 = ''
+      this.searchAddress1.address = ''
+      this.searchAddress1.area = ''
+			// this.queryfirstall();
+			// this.getlistChildren(this.selectrow);
+
+      var q = {
+        type: 0,
+        name: this.input5,
+        address: this.searchAddress1.address,
+        area: this.searchAddress1.area
+      };
+      var data = {
+        q: JSON.stringify(q),
+        type: 0,
+        pageNum: 1,
+        pageSize: 10
+      };
+      console.log(1254)
+      // await this.getcount(data)
+      httpGet(data, this.$api.getSiteList).then(res => {
+        console.log(res);
+        this.projectNum = res.data.list.total
+        var schoollist = res.data.list.list;
+        this.schoollist = schoollist
+        this.setSchoolTotal()
+        this.schooltotal = res.data.list.total;
+      });
 		},
 		// 超级用户密码重置
 		cz(row) {
diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue
index 7b3a901..b27a7b5 100644
--- a/src/views/userManagement.vue
+++ b/src/views/userManagement.vue
@@ -236,7 +236,7 @@
         </div>
       </div>
       <div class="paging">
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage4"
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
           :page-sizes="[10, 20, 100, 200, 500, 1000]" :page-size="pageSize" :layout="paginationConfig" :total="total">
         </el-pagination>
       </div>
@@ -2934,7 +2934,7 @@ export default {
           }
         });
         this.searchCardIds = searchCardIds
-        this.getAboutRoom()
+        // this.getAboutRoom()
         let list = res1.data.list
         setTimeout(()=>{
           list.map(li=>{
@@ -2944,10 +2944,6 @@ export default {
           this.userlist = list;
           this.total = res1.data.total;
         },500)
-        // this.getallstatus(para);
-        // console.log(res1.data.list);
-        // this.userlist = res1.data.list;
-        // this.total = res1.data.total;
       });
     },
     // 获取人员列表
@@ -4550,6 +4546,7 @@ export default {
     // 凭证列表获取
     getcertificate() {
       if (this.credentialSearch.roomId) {
+        console.log(123)
         var t = {
           roomIds: [this.credentialSearch.roomId],
           lockType: 1
@@ -4558,6 +4555,7 @@ export default {
           q: JSON.stringify(t),
         };
         httpPost(data, this.$api.getDeviceItems).then((res) => {
+          console.log(res)
           if (res.success) {
             var data = {
               pageNum: 0,
@@ -4578,6 +4576,7 @@ export default {
           }
         })
       } else {
+        console.log(234)
         var data = {
           pageNum: 0,
           pageSize: 0,
@@ -6882,59 +6881,21 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.getlistNum(0, val);
+      // this.getlistNum(0, val);
+      this.pageSize = val
+      this.pageNum = 1
+      this.handleSearch()
     },
 
     handleCurrentChange(val) {
+      this.pageNum =val
       // console.log(`当前页: ${val}`);
-      this.getlistNum(val, 10);
+      // this.getlistNum(val, 10);
       this.$store.commit("increment", val);
-    },
-    // 分页
-    handleSizeChange2(val) {
-      this.pageSize2 = val
-      this.getlistNum2(0, val);
-    },
-    handleCurrentChange2(val) {
-      this.currentPage2 = val
-      // console.log(`当前页: ${val}`);
-      this.getlistNum2(val, 10);
-    },
-    getlistNum2(val, size) {
-      var data = {
-        pageNum: this.currentPage2,
-        pageSize: this.pageSize2,
-        orderBy: "create_at desc",
-        q: {
-          cardId: this.drawerRow.id,
-        },
-      };
-      httpGet(data, this.$api.getCertificates).then((res) => {
-        var certiflist = utils.zlib_unzip(res.data)
-        var AboutDevice = this.allAboutDevice;
-        certiflist.map((li) => {
-          li.createAt = this.time(+new Date(li.createAt));
-          li.userTelephone = JSON.parse(li.content).userTelephone;
-          li.pzname = JSON.parse(li.content).pzname;
-          li['statusText'] = utils.statusCode(li.status)
-          li['startTimeText'] = utils.formatTime(li.startTime)
-          li['endTimeText'] = utils.formatTime(li.endTime)
-          var resultArr = AboutDevice.filter(
-            (_item) => _item.imei == li.imei
-          )[0];
-          if (resultArr) {
-            li.roomId = resultArr.id;
-            li.roomName = resultArr.roomName;
-          } else {
-            li.roomId = "";
-            li.roomName = "";
-          }
-        });
-        this.roomtable2 = certiflist;
-        this.total2 = res.data.total;
-      });
+      this.handleSearch()
     },
     getlistNum(val, size) {
+      console.log(val)
       var q = {
         // type: 0,
         name: this.query.name,