Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

pbl.js

@@ -2011,7 +2011,11 @@ router.route('/getSchool').all((req, res, next) => {
     var json = queryString(req.url);
     getmysql(req, res, "getSchool", json['n']);
 });
-
+//查询报告有作业的目标及有目标有作业的课程
+router.route('/selectMrEva').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectMrEva", json["oid"]);
+});
 //lsc
 //admin 查询学校
 router.route('/getSchoolAdmin').all((req, res, next) => {
@@ -3094,6 +3098,7 @@ function delStudioCourseTypeS(course, courseId, userid) {
     // setTimeout(() => {
     // }, 1000);
 }
+
 function addStudioCourseTypeS(userid, course, _courseId) {
     var _uid = userid;
     var _courses = _courseId