From 8ff5c71e3f02658399b6b93082ee72b9e4026f79 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sat, 22 Jun 2024 20:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/learnPath/allPath.vue | 34 ++++++++++++++++++++++++++++++----
 pages/study/index.vue       | 31 ++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/pages/learnPath/allPath.vue b/pages/learnPath/allPath.vue
index b447d00..d00518d 100644
--- a/pages/learnPath/allPath.vue
+++ b/pages/learnPath/allPath.vue
@@ -21,8 +21,12 @@
 				<text class="text">当前路径</text>
 			</view>
 		</view>
-		<view class="tabel">
-		
+		<view class="table">
+			<view class="table-row" v-for="(row, rowIndex) in tableData" :key="rowIndex">
+			  <view class="table-cell" v-for="(cell, cellIndex) in row" :key="cellIndex">
+				{{ cell }}
+			  </view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -31,7 +35,11 @@
 	export default {
 		data() {
 			return {
-				
+				 tableData: [
+				         ['Header 1', 'Header 2', 'Header 3'],
+				         ['Row 1, Cell 1', 'Row 1, Cell 2', 'Row 1, Cell 3'],
+				         ['Row 2, Cell 1', 'Row 2, Cell 2', 'Row 2, Cell 3']
+				       ]
 			}
 		},
 		onLoad() {
@@ -50,8 +58,26 @@
 <style>
 .all_path{
 	padding: 0 30rpx;
+	padding-top: 38rpx;
+	background: #fff;
+	height: 100vh;
+	.table {
+	  display: table;
+	  width: 100%;
+	}
+	.table-row {
+	  display: table-row;
+	}
+	 
+	.table-cell {
+	  display: table-cell;
+	  border: 1px solid #ddd;
+	  padding: 10px;
+	  text-align: center;
+	  vertical-align: middle;
+	}
 	.headers{
-		margin-top: 38rpx;
+		/* margin-top: 38rpx; */
 		position: relative;
 		display: flex;
 		justify-content: center;
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 94b8280..c76c584 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -147,7 +147,7 @@
 					<view class="name">{{detailData.growName || ''}}</view>
 					<view class="job">
 						<view class="text_name">{{detailData.organizationName || ''}}</view>
-						<text> 学习状态：<text :style="{color: ['#FF8336','#31AF0D','#409EFF '][detailData.studyStatus]}">{{detailData.studyStatus==0?'未开始':detailData.studyStatus==1?'已完成':'进行中'}}</text></text>
+						<text> 学习状态：<text :style="{color: ['#FF8336','#31AF0D','#FFFFFF '][detailData.studyStatus]}">{{detailData.studyStatus==0?'未开始':detailData.studyStatus==1?'已完成':'进行中'}}</text></text>
 					</view>
 					<!-- <view class="plan_item">
 						<image class="image" src="../../static/images/learnpath/file.png" mode=""></image>
@@ -192,17 +192,21 @@
 								<view>当前任务：</view>
 							</view>
 							<view class="right">
-								<view style="margin-bottom: 24rpx;">{{detailData.taskNum}}门</view>
-								<view>{{detailData.currentTaskName}}</view>
+								<view class="text" style="margin-bottom: 24rpx;">{{detailData.taskNum}}门</view>
+								<view class="text">{{detailData.currentTaskName}}</view>
 							</view>
 						</view>
 						<view class="plan_right">
-							
+							<view>总进度</view>
+							<view>{{Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))}}%</view>
+							<view class="line">
+								<u-line-progress :percentage="Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))" activeColor="#ff0000"></u-line-progress>
+							</view>
 						</view>
 					</view>
 				</view>
 				<view class="go_learn" @click="goLearn(detailData)">
-					{{detailData.overallCompletionRate==0?'开始学习':detailData.overallCompletionRate==100?'回顾':'继续学习'}}
+					{{detailData.overallCompletionRate==0?'开始学习':detailData.overallCompletionRate==1?'回顾':'继续学习'}}
 				</view>
 			</view>
 		</view>
@@ -1219,6 +1223,23 @@
 						font-size: 30rpx;
 						color: #3B3C4A;
 						line-height: 42rpx;
+						.text{
+							width: 122rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							
+						}
+					}
+				}
+				.plan_right{
+					// display: flex;
+					// justify-content: center;
+					// align-items: center;
+					    margin-top: 31px;
+					.line{
+						width: 184rpx;
+						height: 1rpx;
 					}
 				}
 			}