From a58208ba19f52c8d13a0ab1a88bd62ffe8802dd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 三月 2025 17:03:45 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/layouts/AppLayout.vue | 8 ++++----
admin/src/layouts/TableLayout.vue | 6 +++---
admin/src/views/business/reportRecord.vue | 7 ++++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9 ++++-----
admin/src/layouts/TableLayout1.vue | 6 +++---
admin/src/components/common/Pagination.vue | 6 +++---
admin/src/router/index.js | 4 ++--
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 91af47d..d4a6f28 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -40,15 +40,15 @@
</script>
<style lang="scss" scoped>
.table-pagination {
- margin-left: -18px;
- padding: 16px 0px 16px 25px;
+ margin-left: 0px;
+ padding: 16px 0px;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
position: fixed;
- bottom: 25px;
+ bottom: 0px;
background-color: white;
margin-right: 50px;
}
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index face93a..cf6447e 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -56,15 +56,15 @@
background: #F7F8F9;
height: 100%;
display: flex;
- // overflow: hidden;
- overflow: scroll;
+ overflow: hidden;
+ //overflow: scroll;
// 宸﹁竟鑿滃崟
.el-aside {
width: $menu-width !important;
flex-shrink: 0;
// height: 100%;
// height: 900px;
- height: calc(100vh - 80px);
+ height: calc(100vh - 60px);
overflow-y: scroll;
overflow-x: hidden;
background: #fff;
@@ -84,7 +84,7 @@
width: 100%;
//height: 100%;
overflow: hidden;
- height: calc(100vh - 94px);
+ height: calc(100vh - 60px);
padding: 0;
position: relative;
display: flex;
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 3386129..0ba9fbd 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -175,15 +175,15 @@
}
// 鍒嗛〉
.table-pagination {
- margin-left: -18px;
- padding: 16px 0px 16px 25px;
+ margin-left: 0px;
+ padding: 16px 0px;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
position: fixed;
- bottom: 25px;
+ bottom: 0px;
background-color: white;
margin-right: 50px;
}
diff --git a/admin/src/layouts/TableLayout1.vue b/admin/src/layouts/TableLayout1.vue
index 453b42b..aaee5ed 100644
--- a/admin/src/layouts/TableLayout1.vue
+++ b/admin/src/layouts/TableLayout1.vue
@@ -158,15 +158,15 @@
}
// 鍒嗛〉
.table-pagination {
- margin-left: -18px;
- padding: 16px 0px 16px 25px;
+ margin-left: 0px;
+ padding: 16px 0px ;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
position: fixed;
- bottom: 25px;
+ bottom: 0px;
background-color: white;
margin-right: 50px;
}
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 224a5f2..3f3c68d 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -106,12 +106,12 @@
const height = window.innerHeight
console.log('beforeEach========================锛�' + height)
const height13 = getEleHeghtByClassName('common-header', 0)
+ const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0] ? document.getElementsByTagName('thead')[0].clientHeight : 0
if (document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]) {
console.log('main_app========================')
// alert(height)
const height3 = getEleHeghtByClassName('main-header', 0)
- const height4 = getEleHeghtByClassName('table-pagination', 0)
const height2 = getEleHeghtByClassName('toolbar', 0)
const height6 = getEleHeghtByClassName('doumee-filter', 0, 16)
const height7 = getEleHeghtByClassName('pt16', 0, 0)
@@ -125,7 +125,7 @@
console.log('tableLayout========================')
const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
const height3 = getEleHeghtByClassName('main-header', 0)
- const height4 = getEleHeghtByClassName('table-pagination', 0)
+ // const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
const height2 = getEleHeghtByClassName('toolbar', 0)
console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index d6f2406..53cc989 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -240,15 +240,16 @@
<style lang="scss" scoped>
.table-pagination {
- margin-left: -18px;
- padding: 16px 0px 16px 25px;
+
+ margin-left: 0px;
+ padding: 16px 0px ;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
position: fixed;
- bottom: 25px;
+ bottom: 0px;
background-color: white;
margin-right: 50px;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 921d94a..7e673c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -609,18 +609,17 @@
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
);
- if ((carsMapper!=null && carsList.size()>0)){
+ if (carsList!=null && carsList.size()>0){
for(Cars car :carsList){
- if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
- Cars model = new Cars();
+ if(Constants.equalsInteger(car.getAuthStatus(),Constants.ONE)){
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,car.getId())
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
.set(Cars::getAuthTimeType,null)
.set(Cars::getAuthStatus,Constants.ZERO)
- .set(Cars::getEditDate,model.getEditDate())
- .set(Cars::getEdirot,model.getEdirot())
+ .set(Cars::getEditDate,member.getEditDate())
+ .set(Cars::getEdirot,member.getEditor())
);
//鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
--
Gitblit v1.9.3