From dd10896e9ca6a8c7c521b9a8634539e6923b917c Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 19 Mar 2024 17:45:10 +0800
Subject: [PATCH] 更新

---
 pages/statistics/index.vue |   36 ++++++++++++++++++++++++++++--------
 pages.json                 |    2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index de67526..72eb300 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,7 @@
 			"path": "pages/statistics/index",
 			"style": {
 				"navigationBarTitleText": "驾驶舱",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},
 
diff --git a/pages/statistics/index.vue b/pages/statistics/index.vue
index 8b6247d..236616a 100644
--- a/pages/statistics/index.vue
+++ b/pages/statistics/index.vue
@@ -252,13 +252,17 @@
 				},
 				houseLabelChartData: {},
 				housePieOpts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
+					// color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+					// 	"#ea7ccc"
+					// ],
 					padding: [5, 5, 5, 5],
 					enableScroll: false,
+					// rotate: false,
+					// rotateLock: false,
+					// dataLabel: true,
 					extra: {
-						ring: {
+						pie: {
+							centerColor: "#fff",
 							customRadius: 55,
 							activeOpacity: 0.5,
 							activeRadius: 10,
@@ -268,6 +272,16 @@
 							borderWidth: 3,
 							borderColor: "#FFFFFF"
 						}
+						// ring: {
+						// 	ringWidth: 60,
+						// 	activeOpacity: 0.5,
+						// 	activeRadius: 10,
+						// 	offsetAngle: 0,
+						// 	labelWidth: 15,
+						// 	border: false,
+						// 	borderWidth: 3,
+						// 	borderColor: "#FFFFFF"
+						// }
 					}
 				},
 				gridData: {},
@@ -285,10 +299,16 @@
 		onLoad() {
 			this.tabList = getTabbarList(2);
 			this.refreshData();
-			// uni.$on('refreshStatistics', () => {
-			// 	this.refreshData();
-			// })
 		},
+
+		//下拉刷新
+		onPullDownRefresh() {
+			this.refreshData();
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 300)
+		},
+
 
 
 		methods: {
@@ -550,7 +570,7 @@
 	.report-item,
 	.report-item-bg,
 	.report-item-inner {
-		width: 330rpx;
+		width: 300rpx;
 		height: 167rpx;
 		border-radius: 10rpx;
 	}

--
Gitblit v1.9.3