From 791a71899b138295e5fcc0674e7e9b7aa0a31e3f Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 31 Jul 2024 17:29:10 +0800
Subject: [PATCH] bug
---
fuintAdmin_zt/src/assets/styles/element-ui.scss | 1 +
fuintAdmin_zt/src/views/Service/index.vue | 4 ++++
fuintAdmin_zt/src/views/Site/add.vue | 4 ++--
fuintAdmin_zt/src/views/Site/index.vue | 7 +++----
fuintAdmin_zt/src/views/components/Service/allOrder.vue | 2 ++
fuintAdmin_zt/src/views/components/Service/payment.vue | 2 ++
fuintAdmin_zt/src/views/components/Service/staff.vue | 3 ++-
fuintAdmin_zt/src/views/components/Service/way.vue | 2 ++
.../src/views/financialStatement/dai_yunyingfenxi/list.vue | 4 ++--
.../views/financialStatement/dai_yunyingfenxi/tab/paym.vue | 2 ++
.../financialStatement/dai_yunyingfenxi/tab/paytype.vue | 2 ++
.../src/views/financialStatement/jiaoyiduizhang/list.vue | 2 +-
.../views/financialStatement/jiaoyiduizhang/tab/int.vue | 4 +++-
.../views/financialStatement/jiaoyiduizhang/tab/oil.vue | 4 ++--
.../views/financialStatement/jiaoyiduizhang/tab/store.vue | 4 +++-
.../views/financialStatement/jiaoyiduizhang/tab/vip.vue | 4 +++-
.../src/views/financialStatement/yunyingfenxi/list.vue | 2 +-
.../src/views/financialStatement/yunyingfenxi/tab/int.vue | 2 ++
.../src/views/financialStatement/yunyingfenxi/tab/oil.vue | 4 +++-
.../views/financialStatement/yunyingfenxi/tab/store.vue | 4 +++-
.../src/views/financialStatement/yunyingfenxi/tab/vip.vue | 4 +++-
fuintAdmin_zt/src/views/setting/app/index.vue | 6 ++++++
fuintAdmin_zt/src/views/setting/banner/index.vue | 2 ++
fuintAdmin_zt/src/views/setting/hardware.vue | 2 ++
fuintAdmin_zt/src/views/setting/message.vue | 2 ++
fuintAdmin_zt/src/views/setting/pay/index.vue | 2 ++
fuintAdmin_zt/src/views/setting/sysLog.vue | 2 ++
fuintAdmin_zt/src/views/system/notify/index.vue | 1 -
fuintAdmin_zt/src/views/system/notify/page/mode.vue | 3 +++
fuintAdmin_zt/src/views/system/notify/page/record.vue | 2 ++
30 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/fuintAdmin_zt/src/assets/styles/element-ui.scss b/fuintAdmin_zt/src/assets/styles/element-ui.scss
index 44f149632..439ba75ca 100644
--- a/fuintAdmin_zt/src/assets/styles/element-ui.scss
+++ b/fuintAdmin_zt/src/assets/styles/element-ui.scss
@@ -127,6 +127,7 @@
}
.el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #FF9655 !important;
+ color: white !important;
}
.el-pagination.is-background .el-pager li:hover{
color: #FF9655 !important;/*hover时候的文字颜色*/
diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue
index 63f9bc7df..b66175e00 100644
--- a/fuintAdmin_zt/src/views/Service/index.vue
+++ b/fuintAdmin_zt/src/views/Service/index.vue
@@ -50,6 +50,8 @@
+
+
+
+
全部-->
-
+
全选
展开
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 712998414..02c033598 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -36,8 +36,7 @@
-
+
@@ -2175,12 +2174,12 @@ export default {
.app-container{
width: 100%;
- height: 100vh;
+ height: 100%;
background: #f6f8f9;
}
.left-box{
box-sizing: border-box;
- height: 85vh;
+ height: 77vh;
padding: 15px;
overflow-y: auto; /* 只显示垂直滚动条 */
}
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index f4bc9fb40..54feb3fc9 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -83,6 +83,7 @@
+
@@ -149,6 +150,7 @@
+
-
+
+
-
+
@@ -273,6 +273,8 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
.table-box{
width: 100%;
+ height: 65vh;
+ overflow: auto;
}
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
index fc4df9313..6e5c44b59 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
@@ -1,6 +1,6 @@
-
+
@@ -76,7 +76,7 @@
-
+
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index edcf906a1..8ce0ed93c 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -1,6 +1,6 @@
-
+
@@ -272,6 +272,8 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
.table-box{
width: 100%;
+ height: 65vh;
+ overflow: auto;
}
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 43db0537a..944c4c402 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -1,6 +1,6 @@
-
+
@@ -276,6 +276,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
+ height: 66vh;
+ overflow: auto;
}
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
index bcf9503b6..1d77ae56f 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
@@ -121,7 +121,7 @@ background-color: #FFFFFF;
//border: 1px solid #EBEEF5;
}
.nbox{
- margin-left: 30px;
+ margin-right: 30px;
}
.fount-box{
font-size: 14px;
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index 4c53173cb..185d5930f 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -298,6 +298,8 @@ export default {
.table-box {
width: 100%;
+ height: 47vh;
+ overflow: auto;
}
.wrap-box {
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 1a146017f..c79d2e4f4 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -1,6 +1,6 @@
-
+
@@ -342,6 +342,8 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
+ height: 47vh;
+ overflow: auto;
}
.wrap-box{
width: 100%;
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 9f404089b..a91f7bc7b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -1,6 +1,6 @@
-
+
@@ -317,6 +317,8 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
+ height: 47vh;
+ overflow: auto;
}
.wrap-box{
width: 100%;
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index bd913e2b3..e155ba0b0 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -1,6 +1,6 @@
-
+
@@ -239,6 +239,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
.table-box{
width: 100%;
+ height: 49vh;
+ overflow: auto;
}
.wrap-box{
width: 100%;
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index d36cb9b50..46be8b838 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -45,6 +45,8 @@
+
+
@@ -85,6 +87,7 @@
+
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
index 85722ee21..07e1f5ac7 100644
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@@ -54,6 +54,7 @@
+
@@ -103,6 +104,7 @@
+
+
@@ -104,6 +105,7 @@
+
+
@@ -81,6 +82,7 @@
+
+
@@ -121,6 +122,7 @@
+
+
@@ -105,6 +106,7 @@
+
-->
+
+
@@ -82,6 +84,7 @@
+
+
@@ -85,6 +86,7 @@
+