From 4beeb3780f069e6622ab667b280e9470bfca7f3f Mon Sep 17 00:00:00 2001
From: lidan <lidan_1024@126.com>
Date: Mon, 31 Jul 2023 19:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |  2 +-
 pages/supervise/supervise.vue     | 11 ++++++++---
 pages/supervise/superviseList.vue | 22 ++++++++++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pages.json b/pages.json
index 8c55a49..db9d0e1 100644
--- a/pages.json
+++ b/pages.json
@@ -28,7 +28,7 @@
 			"path": "pages/supervise/supervise",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		}, {
diff --git a/pages/supervise/supervise.vue b/pages/supervise/supervise.vue
index b6e620d..3029421 100644
--- a/pages/supervise/supervise.vue
+++ b/pages/supervise/supervise.vue
@@ -8,7 +8,7 @@
 		<view style="height: calc(100vh - 24vh);padding: 10px;margin-top: -12px;"
 			:style="{background: 'url('+applet+'/jg/bg.png) no-repeat',backgroundSize:'100% 100%'}">
 			<view class="charts-box">
-				<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartData" />
+				<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartData" :canvas2d="true"/>
 			</view>
 			<view class="home-left-bottom">
 				<view class="home-left-bottom-item"
@@ -129,13 +129,18 @@
 					url: '/pages/login/index'
 				})
 			}
-		}
+		},
+		onPullDownRefresh() {
+			this.loadData()
+			//下拉刷新
+			uni.stopPullDownRefresh();
+		},
 	}
 </script>
 
 <style scoped lang="scss">
 	.charts-box {
-		width: 50%;
+		width: 200px;
 		height: 200px;
 		margin: 30px auto;
 		// background-color: #fff;
diff --git a/pages/supervise/superviseList.vue b/pages/supervise/superviseList.vue
index 6a63855..885e2de 100644
--- a/pages/supervise/superviseList.vue
+++ b/pages/supervise/superviseList.vue
@@ -14,13 +14,15 @@
 		<uni-list class="custom-list">
 			<u-card class="custom-card" v-for="(val,index) in list"
 				:show-foot="false" :show-head="false">
-				<view slot="body" class="u-body-title">企业名称：{{val.unitName}}</view>
-				<view slot="body" class="u-body-item-desc">应打卡：{{val.sum}}人</view>
-				<view slot="body" class="u-body-item-desc">已打卡：{{val.recnum}}人</view>
-				<view slot="body" class="u-body-item-desc">打卡时间：</view>
-				<view slot="body" class="u-body-item-desc" style="display: flex;justify-content: space-between;width: 70%;margin-left: 10%;">
-					<view class="u-body-item-desc" v-for="item in val.ut.split(',')" >{{item}}</view>
+				<view slot="body"><span class="u-body-title">企业名称：</span><span class="u-body-item-desc">{{val.unitName}}</span></view>
+				<view slot="body"><span class="u-body-title">应打卡：</span><span class="u-body-item-desc">{{val.sum}}人</span></view>
+				<view slot="body"><span class="u-body-title">已打卡：</span><span class="u-body-item-desc">{{val.recnum}}人</span></view>
+				<view slot="body"><span class="u-body-title">打卡时间：</span>
+					<span class="u-body-item-desc" v-for="item in val.ut.split(',')" >{{item}}</span>
 				</view>
+				<!-- <view slot="body" class="u-body-title" style="display: flex;justify-content: space-between;width: 70%;margin-left: 10%;">
+					
+				</view> -->
 			</u-card>
 		</uni-list>
 	</view>
@@ -112,8 +114,10 @@
 		}
 	}
 	.u-body-title {
-		font-size: 32rpx;
+		font-size: 28rpx;
 		color: #333;
+		font-weight: 550;
+		padding: 8rpx 0;
 	}
 	
 	.u-body-item {
@@ -123,7 +127,9 @@
 	.u-body-item-desc {
 		font-size: 28rpx;
 		color: #555;
-		padding: 0rpx;
+		padding: 8rpx;
+		float: right;
+		font-weight: 0;
 	}
 	
 	.u-body-item image {