|
@@ -223,9 +223,13 @@ export default {
|
|
...this.searchForm,
|
|
...this.searchForm,
|
|
});
|
|
});
|
|
this.tableList = res.data.rows.map((student) => {
|
|
this.tableList = res.data.rows.map((student) => {
|
|
- let activityCourseDetail = JSON.parse(student.activityCourseDetail);
|
|
|
|
|
|
+ let activityCourseDetail = {}
|
|
|
|
+ if(student.activityCourseDetail){
|
|
|
|
+ activityCourseDetail = JSON.parse(student.activityCourseDetail);
|
|
|
|
+ }
|
|
|
|
+
|
|
let obj = { ...student, ...activityCourseDetail,}
|
|
let obj = { ...student, ...activityCourseDetail,}
|
|
- console.log(obj)
|
|
|
|
|
|
+ // console.log(obj)
|
|
return obj;
|
|
return obj;
|
|
});
|
|
});
|
|
this.rules.total = res.data.total;
|
|
this.rules.total = res.data.total;
|