From 749740100d5e34ea440d772d67a1ecdc0b7c5032 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Mon, 11 Mar 2024 16:32:35 +0800 Subject: [PATCH] 1 --- miniprogram/api/meeting/equipment.js | 9 ++ .../meeting/accessControl/accessControl.js | 34 +++- .../meeting/accessControl/accessControl.wxml | 10 +- .../meeting/accessControl/accessControl.wxss | 4 +- .../accessControlRecord.js | 151 ++++++++++++------ .../accessControlRecord.json | 7 +- .../accessControlRecord.wxml | 18 +-- .../accessControlRecord.wxss | 42 +---- 8 files changed, 170 insertions(+), 105 deletions(-) diff --git a/miniprogram/api/meeting/equipment.js b/miniprogram/api/meeting/equipment.js index b727cd1..3831ea7 100644 --- a/miniprogram/api/meeting/equipment.js +++ b/miniprogram/api/meeting/equipment.js @@ -18,4 +18,13 @@ export function openDoorRq(data) { method: "post", data }); +} + +// 开门记录 +export function getOpenDoorRecordRq(data) { + return request({ + url: `/api/equipment/getOpenDoorRecord?pageNum=${data.pageNum}&pageSize=${data.pageSize}`, + method: "post", + data + }); } \ No newline at end of file diff --git a/miniprogram/pages/meeting/accessControl/accessControl.js b/miniprogram/pages/meeting/accessControl/accessControl.js index 388f7af..3a8a522 100644 --- a/miniprogram/pages/meeting/accessControl/accessControl.js +++ b/miniprogram/pages/meeting/accessControl/accessControl.js @@ -2,9 +2,15 @@ const app = getApp() import Notify from '@vant/weapp/notify/notify'; +import { + selfFormatTimeYMD, + selfFormatTimeHM +} from "../../../utils/util.js" + import { getEquipmentByUserIdRq, - openDoorRq + openDoorRq, + getOpenDoorRecordRq } from "../../../api/meeting/equipment.js" Page({ @@ -17,6 +23,7 @@ Page({ activeNames: [0], userDetail: {}, equipmentDataList: [], + openRecordList: [], }, /** @@ -35,6 +42,8 @@ Page({ }) // 获取设备数据 _this.getEquipmentData(); + // 获取-开门记录数据 + _this.getOpenRecordData() }, // 获取设备数据 @@ -60,6 +69,27 @@ Page({ }) }, + // 获取-开门记录数据 + getOpenRecordData() { + let _this = this; + getOpenDoorRecordRq({ + userId: _this.data.userDetail.id, + pageNum: 1, + pageSize: 10 + }).then(res => { + console.log('getOpenRecordData', res); + let openRecordList = res.data.records + openRecordList = openRecordList.map(item => { + item.createTimeYMD = selfFormatTimeYMD(item.createTime) + item.createTimeHM = selfFormatTimeHM(item.createTime) + return item; + }) + _this.setData({ + openRecordList + }) + }) + }, + // 开门 openDoor(e) { console.log('openDoor', e); @@ -68,7 +98,7 @@ Page({ let deviceId = e.currentTarget.dataset.deviceid let roomId = e.currentTarget.dataset.roomid let status = e.currentTarget.dataset.status - if (!status == '在线') { + if (status != '在线') { Notify({ type: 'danger', message: '设备不在线!' diff --git a/miniprogram/pages/meeting/accessControl/accessControl.wxml b/miniprogram/pages/meeting/accessControl/accessControl.wxml index 43db89b..652ce41 100644 --- a/miniprogram/pages/meeting/accessControl/accessControl.wxml +++ b/miniprogram/pages/meeting/accessControl/accessControl.wxml @@ -7,7 +7,7 @@ - + {{item.equipmentName}} {{item.equipmentStatus}} @@ -24,12 +24,12 @@ - + - 2024-02-06 - 13:00 + {{item.createTimeYMD}} + {{item.createTimeHM}} - 西大门开启 + {{item.deviceName}} diff --git a/miniprogram/pages/meeting/accessControl/accessControl.wxss b/miniprogram/pages/meeting/accessControl/accessControl.wxss index a9b249f..9acf3c2 100644 --- a/miniprogram/pages/meeting/accessControl/accessControl.wxss +++ b/miniprogram/pages/meeting/accessControl/accessControl.wxss @@ -81,12 +81,12 @@ } .itemTitleView .more { - font-size: 26rpx; + font-size: 28rpx; color: #4b89ef; } .recordView { - padding: 60rpx 24rpx 140rpx; + padding: 20rpx 24rpx; background: white; } diff --git a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.js b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.js index 7c28b55..a8ca6f1 100644 --- a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.js +++ b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.js @@ -1,66 +1,125 @@ -// pages/meeting/accessControl/accessControlRecord.js +const app = getApp() + +import { + selfFormatTimeYMD, + selfFormatTimeHM +} from "../../../../utils/util.js" + +import { + getOpenDoorRecordRq +} from "../../../../api/meeting/equipment.js" + Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { + IMG_NAME: app.IMG_NAME, + userDetail: {}, + openRecordList: [], + pageNum: 1, + pageSize: 25, + isDataAll: false, + }, - }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let _this = this; + let userDetail = wx.getStorageSync('user') + _this.setData({ + userDetail, + ...options, + }) + // 获取-开门记录数据 + _this.getOpenRecordData() + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - }, + // 获取-开门记录数据 + getOpenRecordData() { + let _this = this; + if (_this.data.isDataAll) { + return + } + getOpenDoorRecordRq({ + userId: _this.data.userDetail.id, + pageNum: _this.data.pageNum, + pageSize: _this.data.pageSize + }).then(res => { + console.log('getOpenRecordData', res); + let queryList = res.data.records + if (queryList && queryList.length > 0) { + queryList = queryList.map(item => { + item.createTimeYMD = selfFormatTimeYMD(item.createTime) + item.createTimeHM = selfFormatTimeHM(item.createTime) + return item; + }) + let openRecordList = _this.data.openRecordList.concat(queryList); + _this.setData({ + openRecordList, + pageNum: _this.data.pageNum + 1, + }) - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { + } else { + _this.setData({ + isDataAll: true + }) + } + }) + }, - }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { - /** - * 生命周期函数--监听页面显示 - */ - onShow() { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow() { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { + }, - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + console.log('onReachBottom 页面上拉触底'); + let _this = this; + // 获取-开门记录数据 + _this.getOpenRecordData(); + }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { - } + } }) \ No newline at end of file diff --git a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.json b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.json index 8a92b70..c58e9a8 100644 --- a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.json +++ b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, - "navigationBarTitleText": "开门记录" + "usingComponents": { + "van-divider": "@vant/weapp/divider/index" + }, + "navigationBarTitleText": "开门记录", + "onReachBottomDistance": 100 } \ No newline at end of file diff --git a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxml b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxml index cad448b..176dbd4 100644 --- a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxml +++ b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxml @@ -1,19 +1,13 @@ - - - - + - + - 2024-02-06 - 13:00 + {{item.createTimeYMD}} + {{item.createTimeHM}} - 西大门开启 + {{item.deviceName}} + 数据已全部加载 \ No newline at end of file diff --git a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxss b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxss index 7f30910..411dd94 100644 --- a/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxss +++ b/miniprogram/pages/meeting/accessControl/accessControlRecord/accessControlRecord.wxss @@ -1,40 +1,10 @@ - -.container{ - width: 100vw; - height: 100vh; - background: #ffffff; - overflow-y: auto; -} - -.itemTitleView { - display: flex; - justify-content: center; - align-items: center; - margin-top: 30rpx; -} - -.itemTitleView .title { - margin: 0 30rpx; - font-size: 32rpx; - font-weight: bold; - color: #141414; -} - -.itemTitleView .line{ - flex: 1; - height: 1rpx; - background: gray; - opacity: 0.12; -} - -.itemTitleView .more { - font-size: 26rpx; - color: #4b89ef; +.containerView.public { + height: auto; } .recordView { - padding: 60rpx 24rpx 140rpx; - background: white; + padding: 60rpx 24rpx 10rpx; + /* background: white; */ } .recordView .recordItem { @@ -45,7 +15,7 @@ background: #ffffff; } -.recordView .recordItem:nth-child(2n){ +.recordView .recordItem:nth-child(2n) { background: #f9fafc; } @@ -82,4 +52,4 @@ font-size: 26rpx; word-break: break-all; line-height: 1; -} +} \ No newline at end of file