Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

src/components/index/workSituation/examList.vue

@@ -89,6 +89,7 @@
 	export default {
 		props: {
 			dataList:[],
+			CourseId :0
 		},
         emits:['change'],
 		components: {},
@@ -105,7 +106,7 @@
                     // Uid:726615,
                     // CourseId:44977497,
                     Uid:0,
-                    CourseId:44977497,
+                    CourseId:props.CourseId,
                     ExamName:''
                 },
                 fileList:[],
@@ -134,19 +135,15 @@
                 },
                 // 重新导入
                 clickReimport(item){
-                    // data.uploadParm.ExamName = item.ExamName
-                    // data.uploadParm.Uid = data.userData.Id
-                    // data.uploadParm.CourseId = data.Msg.CourseId
-                    // data.uploadParm.ExamName = tem.ExamName
                     uni.showModal({
                         title: '提示',
-                        content: '重新导入将要删除该数据,是否继续',
+                        content: '重新导入将要清除此考试数据,是否继续',
                         success: function (res) {
                             if (res.confirm) {
                                 that.DelExamInfo(item)
                             } else if (res.cancel) {
                                 uni.showToast({
-                                    title:'已取消删除',
+                                    title:'已取消',
                                     icon:'none',
                                     duration: 500
                                 })
@@ -166,7 +163,8 @@
                                 icon:'none',
                                 duration: 500
                             })
-                            data.show = true 
+                            data.show = true ;
+							proxy.$parent.getExamPageList();
                         }
 					})
                 },
@@ -231,7 +229,7 @@
                     data.userData = uni.getStorageSync('userInfo')
                     data.uploadParm = {
                         Uid:data.userData.Id,
-                        CourseId:data.Msg.CourseId,
+                        CourseId:data.uploadParm.CourseId,
                         ExamName: data.uploadParm.ExamName
                     }
                     data.loading = true

src/pages/index/workSituation.vue

@@ -43,7 +43,7 @@
 				>
 				<operation v-if="tabNme=='作业情况'" :dataList="homeWorks"></operation>
 				<studentList @selected="selectStuHandler" v-if="tabNme=='学生列表'" :dataList="students"></studentList>
-				<examList v-if="tabNme=='考试信息'" :dataList="exams"></examList>
+				<examList v-if="tabNme=='考试信息'" :dataList="exams" :CourseId="currentCourseId"></examList>
 			</scroll-view>
 			<Loadmore :state="pageState" />
 		</view>
@@ -136,7 +136,7 @@
 				},
 				changeCourseHandler(id){
 					console.log(id,'........................')
-					data.Msg.courseId=id
+					data.Msg.CourseId=id
 					data.OperationMsg.courseId=id
 					data.currentCourseId=id
 					methods.getCourseStuList()