页面修改

src/components/index/JobComponents.vue

@@ -3,7 +3,7 @@
 		<view class="JobComponents activeOne flex">
 			<view class="JobComponents-time-box flex">
 				<view class="JobComponents-time">
-                    <view>05/25 17:13</view> 
+					<view>{{jobData.CreateTime}}</view>
 				</view>
 				<view class="JobComponents-line">
 					<view class="JobComponents-point"></view>
@@ -13,23 +13,25 @@
 				<view class="JobComponents-center-line"></view>
 				<view class="JobComponents-center flex">
 					<view class="JobComponents-left">
-                        <view class="operation-name">作业名称作业名称作业名称作业名称</view>
+						<view class="operation-name">{{jobData.Title}}</view>
 						<view class="operation-state flex">
 							<view class="operation-state-img"></view>
-                            <view class="operation-state-text">批阅</view>
+							<view class="operation-state-text">{{jobData.DataObj.HomeWorkStatusStr}}</view>
 						</view>
 					</view>
 					<view class="JobComponents-right flex">
 						<view class="homework-score">
 							<view class="homework-score-title">得分</view>
 							<view class="homework-score-num flex">
-                                <view>86</view><view>分</view>
+								<view>{{jobData.DataObj.Score}}</view>
+								<view>分</view>
 							</view>
 						</view>
 						<view class="homework-score">
 							<view class="homework-score-title">得分率</view>
 							<view class="homework-score-num flex">
-                                <view>86</view><view>%</view>
+								<view>{{jobData.DataObj.Score_p}}</view>
+								<view>%</view>
 							</view>
 						</view>
 					</view>
@@ -48,12 +50,9 @@
 	} from "vue";
 
 	export default {
-		props: {
-			
-		},
+		props: ["jobData"],
 		components: {},
 		setup() {
-
 			let data = reactive({
 				obj: {
 					Name: '',
@@ -63,7 +62,7 @@
 				showLogin: true, //多次点击
 			});
 			let methods = {
-                JobDetails(){
+				JobDetails() {
 					uni.reLaunch({
 						url: '/pages/index/workSituation'
 					});
@@ -77,29 +76,34 @@
 	};
 </script>
 <style scoped>
-    .homework-score-num view:last-child{
+	.homework-score-num view:last-child {
 		font-size: 23rpx;
 		margin-top: 25rpx;
 	}
-    .homework-score-num view:first-child{
+
+	.homework-score-num view:first-child {
 		margin-right: 10rpx;
 		font-size: 46rpx;
 		font-weight: 800;
 	}
-    .homework-score-num{
+
+	.homework-score-num {
 		color: #3E3D3D;
 	}
-    .homework-score-title{
+
+	.homework-score-title {
 		color: #484646;
 		font-size: 20rpx;
 		margin-bottom: 23rpx;
 		font-weight: 400;
 		letter-spacing: 1px;
 	}
-    .homework-score:first-child{
+
+	.homework-score:first-child {
 		margin-right: 16rpx;
 	}
-    .JobComponents-right{
+
+	.JobComponents-right {
 		height: 122rpx;
 		background: #FFFFFF;
 		padding: 22rpx 26rpx 15rpx 26rpx;
@@ -108,51 +112,64 @@
 		flex-shrink: 0;
 		margin-left: 11rpx;
 	}
-    .JobComponents.activeThree .operation-state-text{
+
+	.JobComponents.activeThree .operation-state-text {
 		color: #CD3D47;
 	}
-    .JobComponents.activeTwo .operation-state-text{
+
+	.JobComponents.activeTwo .operation-state-text {
 		color: #4E4A4A;
 	}
-    .JobComponents.activeOne .operation-state-text{
+
+	.JobComponents.activeOne .operation-state-text {
 		color: #FFFFFF;
 	}
-    .operation-state-text{
+
+	.operation-state-text {
 		font-size: 20rpx;
 		letter-spacing: 2px;
 	}
-    .JobComponents.activeThree .operation-state-img{
+
+	.JobComponents.activeThree .operation-state-img {
 		background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_480.png')no-repeat;
 		background-size: 22rpx 22rpx;
 	}
-    .JobComponents.activeTwo .operation-state-img{
+
+	.JobComponents.activeTwo .operation-state-img {
 		background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_781.png')no-repeat;
 		background-size: 22rpx 22rpx;
 	}
-    .JobComponents.activeOne .operation-state-img{
+
+	.JobComponents.activeOne .operation-state-img {
 		background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_44.png')no-repeat;
 		background-size: 22rpx 22rpx;
 	}
-    .operation-state-img{
+
+	.operation-state-img {
 		width: 22rpx;
 		height: 22rpx;
 		margin-right: 9rpx;
 		margin-top: 4rpx;
 	}
-    .operation-state{
+
+	.operation-state {
 		margin-top: 35rpx;
 		font-size: 20rpx;
 	}
-    .JobComponents.activeThree .operation-name{
+
+	.JobComponents.activeThree .operation-name {
 		color: #282828;
 	}
-    .JobComponents.activeTwo .operation-name{
+
+	.JobComponents.activeTwo .operation-name {
 		color: #282828;
 	}
-    .JobComponents.activeOne .operation-name{
+
+	.JobComponents.activeOne .operation-name {
 		color: #FFFFFF;
 	}
-    .operation-name{
+
+	.operation-name {
 		font-size: 26rpx;
 		word-break: break-all;
 		text-overflow: ellipsis;
@@ -164,14 +181,17 @@
 		letter-spacing: 1px;
 		font-weight: 500;
 	}
-    .JobComponents-left{
+
+	.JobComponents-left {
 		flex: 1;
 		flex-grow: 1;
 	}
-    .JobComponents-center{
+
+	.JobComponents-center {
 		justify-content: space-between;
 	}
-    .JobComponents-center-line{
+
+	.JobComponents-center-line {
 		width: 4rpx;
 		height: 23px;
 		background: #FEFEFE;
@@ -179,34 +199,42 @@
 		left: 0;
 		top: 33rpx;
 	}
-    .JobComponents.activeThree .JobComponents-center-box{
+
+	.JobComponents.activeThree .JobComponents-center-box {
 		background: #EEEEEE;
 	}
-    .JobComponents.activeTwo .JobComponents-center-box{
+
+	.JobComponents.activeTwo .JobComponents-center-box {
 		background: #F9E0E2;
 	}
-    .JobComponents.activeOne .JobComponents-center-box{
+
+	.JobComponents.activeOne .JobComponents-center-box {
 		background: #E64150;
 	}
-    .JobComponents-center-box{
+
+	.JobComponents-center-box {
 		flex-grow: 1;
 		position: relative;
 		border-radius: 30rpx;
 		padding: 21rpx 18rpx 21rpx 24rpx;
 		margin-bottom: 50rpx;
 	}
-    .JobComponents.activeThree .JobComponents-point{
+
+	.JobComponents.activeThree .JobComponents-point {
 		background: #C1C1C1;
 	}
-    .JobComponents.activeTwo .JobComponents-point{
+
+	.JobComponents.activeTwo .JobComponents-point {
 		background: #282828;
 
 	}
-    .JobComponents.activeOne .JobComponents-point{
+
+	.JobComponents.activeOne .JobComponents-point {
 		background: #C81727;
 		box-shadow: 0px 0px 12px 0px rgba(200, 23, 39, 0.46);
 	}
-    .JobComponents .JobComponents-point{
+
+	.JobComponents .JobComponents-point {
 		width: 19rpx;
 		height: 19rpx;
 		position: absolute;
@@ -216,7 +244,8 @@
 		border: 3px solid #FFFFFF;
 		box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
 	}
-    .JobComponents-line{
+
+	.JobComponents-line {
 		width: 4rpx;
 		height: 100%;
 		background: #F1F1F1;
@@ -224,7 +253,8 @@
 		margin-right: 46rpx;
 		position: relative;
 	}
-    .JobComponents-time{
+
+	.JobComponents-time {
 		width: 61rpx;
 		height: 55rpx;
 		color: #CCC8C6;
@@ -233,14 +263,15 @@
 		padding: 14rpx 13rpx;
 		background: #F6F6F6;
 	}
-    .JobComponents-time-box{
 
-    }
-	.JobComponents{
+	.JobComponents-time-box {}
+
+	.JobComponents {
 		justify-content: space-between;
 		padding: 0 50rpx;
 	}
-    .JobComponents-box{
+
+	.JobComponents-box {
 		/* background: #FFFFFF; */
 	}
 </style>

src/components/index/commentsComponents.vue

 <template>
 	<view class="CommentsComponents-box">
 		<view class="CommentsComponents activeOne flex">
-            
 			<view class="CommentsComponents-time-box flex">
 				<view class="CommentsComponents-time">
-                    <view>05/25 17:13</view> 
+					<view>{{jobData.CreateTime}}</view>
 				</view>
 				<view class="CommentsComponents-line">
 					<view class="CommentsComponents-point"></view>
@@ -14,16 +13,11 @@
 				<view class="CommentsComponents-center-line"></view>
 				<view class="CommentsComponents-center flex">
 					<view class="CommentsComponents-left flex">
-                        <van-image width="38rpx" height="38rpx" fit="cover" class="operation-img"
-				src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png"/>
-                        <view class="operation-name">周老师的评语</view>
+						<van-image width="38rpx" height="38rpx" fit="cover" class="operation-img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
+						<view class="operation-name">{{jobData.Title}}</view>
 					</view>
 					<view class="CommentsComponents-right">
-                        你是个做事小心翼翼，感情细腻丰富的女孩
-                        ，每次看你认真的样子老师都很感动。你也是幸运的，周
-                        边有很多人都在关爱着你，所以，对他们，尤其是父母，记得不要
-                        太莽撞，不要太任性，要学着体谅，学着换位思考
-                        ，学着懂事。另外，今后要多运动、多锻炼，有健康才能成就美好未来！
+						{{jobData.DataObj.Comment}}
 					</view>
 				</view>
 			</view>
@@ -40,12 +34,9 @@
 	} from "vue";
 
 	export default {
-		props: {
-			
-		},
+		props: ["jobData"],
 		components: {},
 		setup() {
-
 			let data = reactive({
 				obj: {
 					Name: '',
@@ -61,42 +52,50 @@
 	};
 </script>
 <style scoped>
-    .CommentsComponents-right{
+	.CommentsComponents-right {
 		color: #FFFFFF;
 		font-size: 20rpx;
 		line-height: 35rpx;
 		letter-spacing: 1rpx;
 	}
-    .CommentsComponents.activeThree .operation-name{
+
+	.CommentsComponents.activeThree .operation-name {
 		color: #282828;
 	}
-    .CommentsComponents.activeTwo .operation-name{
+
+	.CommentsComponents.activeTwo .operation-name {
 		color: #282828;
 	}
-    .CommentsComponents.activeOne .operation-name{
+
+	.CommentsComponents.activeOne .operation-name {
 		color: #FFFFFF;
 	}
-    .operation-name{
+
+	.operation-name {
 		font-size: 26rpx;
 		letter-spacing: 1px;
 		font-weight: 500;
 		flex-grow: 1;
 	}
-    .operation-img{
+
+	.operation-img {
 		margin-right: 12rpx;
 		border-radius: 50%;
 		flex-shrink: 0;
 	}
-    .CommentsComponents-left{
+
+	.CommentsComponents-left {
 		flex: 1;
 		flex-grow: 1;
 		margin-top: -5rpx;
 		margin-bottom: 10rpx;
 	}
-    .CommentsComponents-center{
+
+	.CommentsComponents-center {
 		flex-direction: column;
 	}
-    .CommentsComponents-center-line{
+
+	.CommentsComponents-center-line {
 		width: 4rpx;
 		height: 23rpx;
 		background: #FEFEFE;
@@ -104,21 +103,25 @@
 		left: 0;
 		top: 33rpx;
 	}
-    .CommentsComponents.activeOne .CommentsComponents-center-box{
+
+	.CommentsComponents.activeOne .CommentsComponents-center-box {
 		background: #52C1CA;
 	}
-    .CommentsComponents-center-box{
+
+	.CommentsComponents-center-box {
 		flex-grow: 1;
 		position: relative;
 		border-radius: 30rpx;
 		padding: 31rpx 18rpx 21rpx 24rpx;
 		margin-bottom: 50rpx;
 	}
-    .CommentsComponents.activeOne .CommentsComponents-point{
+
+	.CommentsComponents.activeOne .CommentsComponents-point {
 		background: #1E7BF5;
 		box-shadow: 0px 0px 12px 0px rgba(30, 123, 245, 0.46);
 	}
-    .CommentsComponents-point{
+
+	.CommentsComponents-point {
 		width: 19rpx;
 		height: 19rpx;
 		position: absolute;
@@ -128,7 +131,8 @@
 		border: 3px solid #FFFFFF;
 		box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
 	}
-    .CommentsComponents-line{
+
+	.CommentsComponents-line {
 		width: 4rpx;
 		height: 100%;
 		background: #F1F1F1;
@@ -136,7 +140,8 @@
 		margin-right: 46rpx;
 		position: relative;
 	}
-    .CommentsComponents-time{
+
+	.CommentsComponents-time {
 		width: 61rpx;
 		height: 55rpx;
 		color: #CCC8C6;
@@ -145,11 +150,13 @@
 		padding: 14rpx 13rpx;
 		background: #F6F6F6;
 	}
-	.CommentsComponents{
+
+	.CommentsComponents {
 		justify-content: space-between;
 		padding: 0 50rpx;
 	}
-    .CommentsComponents-box{
+
+	.CommentsComponents-box {
 		background: #FFFFFF;
 	}
 </style>

src/components/index/course-card.vue

@@ -49,7 +49,7 @@
 									上课进度 {{item.CompleteNum}}/{{item.TotalClassNum}}
 								</view>
 								<view style="text-align: right;">
-									<van-button @click="hideExchangeBoxHandler" color="#C91727" round size="mini" custom-style="color:#FFF;font-size: 24rpx;padding-left:16rpx;padding-right:10px;">
+									<van-button @click="hideExchangeBoxHandler(item)" color="#C91727" round size="mini" custom-style="color:#FFF;font-size: 24rpx;padding-left:16rpx;padding-right:10px;">
 										选择课程
 									</van-button>
 								</view>
@@ -80,13 +80,15 @@
 		setup(props, context) {
 			let data = reactive({
 				statusBarHeight: 24,
-				showItems: false
+				showItems: false,
+				 
 			});
 			let methods = {
 				exchangeItemHandler() {
 					data.showItems = true
 				},
-				hideExchangeBoxHandler() {
+				hideExchangeBoxHandler(item) {
+					this.$parent.getStuHomeWorkAndExam(item.courseId);
 					data.showItems = false
 				}
 			}

src/pages/index/index.vue

@@ -3,8 +3,7 @@
 		<navbar class="navbarSticky" bg="#F6F6F6">
 			<view class="index-header-box">
 				<view class="index-header-img">
-					<van-image width="100%" height="100%" fit="cover" class="img"
-					src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
+					<van-image width="100%" height="100%" fit="cover" class="img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
 				</view>
 				<view class="index-header-tetx">
 					<view class="index-header-title">
@@ -23,12 +22,15 @@
 		<course-card :stuCourseList="stuCourseList"></course-card>
 		<view class="index-student-title flex">
 			<text>考情详情</text>
-			<view>(共53条)</view>
+			<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
 		</view>
 		<view class="index-student-information">
-			<JobComponents></JobComponents>
-			<examComponents></examComponents>
-			<commentsComponents></commentsComponents>
+			<template v-for="(item,index) in workList">
+				<JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents>
+				<examComponents  v-if="item.ResultType==2">></examComponents>
+				<commentsComponents  v-if="item.ResultType==3" :jobData="item"></commentsComponents>
+			</template>
+			
 		</view>
 	</view>
 </template>
@@ -75,8 +77,13 @@
 				proxy
 			} = getCurrentInstance();
 			let data = reactive({
-				stuCourseList: [],//学员课程列表
-				userData: {},//用户信息
+				stuCourseList: [], //学员课程列表
+				userData: {}, //用户信息
+				//学员作业和考试查询参数
+				workMsg: {
+					courseId: 0,
+				},
+				workList: [],//学员作业、考试、评语数据
 			});
 
 			let methods = {
@@ -133,8 +140,21 @@
 				//获取学员课程列表
 				getStuCourse() {
 					proxy.$request("/Stu/GetStuCourse", {}).then(res => {
-						data.stuCourseList = res.Data;
-						//console.log("data.stuCourseList",this.stuCourseList)
+						let tempArray = res.Data;
+						data.stuCourseList = tempArray;
+						if (tempArray && tempArray.length > 0) {
+							this.getStuHomeWorkAndExam(tempArray[0].courseId)
+						}
+					})
+				},
+				//获取学员作业、考试、评语
+				getStuHomeWorkAndExam(courseId) {
+					console.log("courseId", courseId)
+					this.workMsg.courseId = courseId;
+					data.workList = [];
+					proxy.$request("/Stu/GetStuWork", this.workMsg).then(res => {
+						console.log("res.Data", res.Data)
+						data.workList = res.Data;
 					})
 				},
 				async getColor(src, index, y) {
@@ -179,35 +199,41 @@
 </script>
 
 <style scoped>
-	.index-student-title view{
+	.index-student-title view {
 		font-size: 25rpx;
 		color: #ABABAB;
 		margin-left: 20rpx;
 		padding: 13rpx 0 0 0;
 	}
-	.index-student-title text{
+
+	.index-student-title text {
 		font-size: 36rpx;
 		font-weight: 800;
 		color: #282828;
 	}
-	.index-student-title{
+
+	.index-student-title {
 		padding: 0 50rpx 45rpx;
 	}
-	.index-student-information{
+
+	.index-student-information {
 		min-height: 500rpx;
-		background: rgba(255,255,255,.7);
+		background: rgba(255, 255, 255, .7);
 		border-radius: 50rpx 50rpx 0 0;
 		padding: 71rpx 0 0 0;
 	}
-	.index-header-name{
+
+	.index-header-name {
 		font-size: 30rpx;
 		color: #474747;
 	}
-	.index-header-tetx{
+
+	.index-header-tetx {
 		color: #D0D0D0;
 		font-size: 24rpx;
 	}
-	.index-header-img .img{
+
+	.index-header-img .img {
 		display: block;
 		border: 2rpx solid rgba(164, 164, 164, 0.32);
 		border-radius: 50%;
@@ -217,7 +243,8 @@
 		box-sizing: border-box;
 		margin: 4rpx;
 	}
-	.index-header-img{
+
+	.index-header-img {
 		width: 68rpx;
 		height: 68rpx;
 		border-radius: 50%;
@@ -226,6 +253,7 @@
 		margin-right: 20rpx;
 		background: #FFFFFF;
 	}
+
 	.indexpage {
 		min-height: 100vh;
 		background-color: #f6f6f6;
@@ -235,26 +263,29 @@
 		background-repeat: no-repeat;
 		background-size: 100% auto;
 	}
-	.index-header-box{
+
+	.index-header-box {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		padding:0rpx 42rpx ;
+		padding: 0rpx 42rpx;
 	}
-	.index-header-box .index-header-title{
+
+	.index-header-box .index-header-title {
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #B8B8B8;
 	}
-	.index-header-box .index-header-name{
+
+	.index-header-box .index-header-name {
 		font-size: 30rpx;
 		font-weight: 800;
 		color: #282828;
 	}
+
 	.navbarSticky {
 		display: sticky;
 		top: 0;
 		z-index: 9;
 	}
-	
 </style>