From 67b098488373e9adf9b6f686f534d24aefc3f0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 24 May 2019 14:20:01 +0800 Subject: [PATCH] b --- app/views/common/index.html.erb | 2 +- public/react/.vscode/settings.json | 3 --- public/react/src/App.js | 15 ++++++++++----- .../ecCompletion_calculation.js | 2 ++ .../ec/ecCourseEvaluations/ecCourseEvaluations.js | 2 +- .../ecCourseEvaluationsbottom.js | 4 +++- .../ec/ecCourseSupports/ecCourseSupports.js | 4 +++- .../ec/ecGradeEvaluations/ecGradeEvaluations.js | 1 + .../src/modules/ec/ecStudentList/ecStudentList.js | 9 ++++++--- public/react/src/modules/ec/ecTitle/ecTitle.js | 10 +++++++--- 10 files changed, 34 insertions(+), 18 deletions(-) delete mode 100644 public/react/.vscode/settings.json diff --git a/app/views/common/index.html.erb b/app/views/common/index.html.erb index d99476a6..e5922129 100644 --- a/app/views/common/index.html.erb +++ b/app/views/common/index.html.erb @@ -1 +1 @@ -Educoder
\ No newline at end of file +Educoder
\ No newline at end of file diff --git a/public/react/.vscode/settings.json b/public/react/.vscode/settings.json deleted file mode 100644 index 0e0dcd23..00000000 --- a/public/react/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/public/react/src/App.js b/public/react/src/App.js index d0451eaa..9c89cb1b 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -125,12 +125,13 @@ const NewContentCareerPathIndex =Loadable({ loader: () => import('./modules/careerPath/managementsCareerPath/New_Content_Career_Path_Index'), loading: Loading, }) - +{/*课程体系对毕业要求的支撑*/} const ecCourseSupports=Loadable({ loader: () => import('./modules/ec/ecCourseSupports/ecCourseSupports'), loading: Loading, }) +//课程体系 const ecCourseEvaluations=Loadable({ loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluations'), loading: Loading, @@ -141,11 +142,12 @@ const ecGradeEvaluations=Loadable({ loading: Loading, }) +{/*课程目标评价方法*/} const EvaluationMethods=Loadable({ loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom'), loading: Loading, }) - +{/*达成评价详情*/} const EcCompletionCalculation=Loadable({ loader: () => import('./modules/ec/ecCompletion_calculation/ecCompletion_calculation'), loading: Loading, @@ -190,18 +192,21 @@ class App extends Component { - + {/*课程体系对毕业要求的支撑*/} + {/*课程体系*/} - + {/*达成评价详情*/} + {/*课程目标评价方法*/} + @@ -262,7 +267,7 @@ class App extends Component { - + {/*达成评价详情*/} diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js index 01506142..46a61ef0 100644 --- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js +++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js @@ -443,6 +443,8 @@ class EcCompletionCalculation extends Component { 课程体系 > {schooldata.ec_course_name} 达成评价详情 {/* 导出培养目标 */} +
系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 查看详情
+
课程体系 > {schooldata.ec_course_name} +
请结合本课程的教学情况，修改考核方式、并导入学生的对应考核成绩 查看详情
{/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js index 4f04349f..7f82aa46 100644 --- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js +++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js @@ -712,7 +712,9 @@ class EcCourseEvaluationsbottom extends Component {

课程体系 > {schooldata.ec_course_name} - {/*课程考核方式与数据来源*/} +

请结合本课程的教学情况，修改说明每个课程目标的评价环节和评估方式 查看详情
+ + {/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js index 36ebcd4e..63ae4f90 100644 --- a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js +++ b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js @@ -481,11 +481,13 @@ class ecCourseSupports extends Component {
- 课程体系对毕业要求的支撑 + 课程体系对毕业要求的支撑 {/* 导出培养目标 */} 导出课程体系支撑矩阵 +
用矩阵图的形式说明本专业课程体系对毕业要求的支撑关系 查看详情
+
毕业要求指标点（{data.subitems_count}） diff --git a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js index c8598e94..e99bed9c 100644 --- a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js +++ b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js @@ -271,6 +271,7 @@ class ecGradeEvaluations extends Component {

课程体系 > {schooldata.ec_course_name} + {/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecStudentList/ecStudentList.js b/public/react/src/modules/ec/ecStudentList/ecStudentList.js index 63a56b43..66554a77 100644 --- a/public/react/src/modules/ec/ecStudentList/ecStudentList.js +++ b/public/react/src/modules/ec/ecStudentList/ecStudentList.js @@ -23,6 +23,7 @@ class ecStudentList extends Component { schooldata:{}, majorschoollist:undefined, titlemessage:"提示", + ecComponentState:"ecStudentList", visible:false, Modallist:'', Modallisttypes:0, @@ -319,7 +320,7 @@ class ecStudentList extends Component {

学生列表 @@ -329,9 +330,11 @@ class ecStudentList extends Component {
学生列表（ + className=" font-18 courseSystem">学生列表（ {majorschoollist===undefined?"":majorschoollist.total_student} - ）
+ ） +
提供模板支持导入学生信息(请先下载模板) 查看详情
+
{ismanager===false?"": diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.js b/public/react/src/modules/ec/ecTitle/ecTitle.js index 0c6d4e7d..02b31a84 100644 --- a/public/react/src/modules/ec/ecTitle/ecTitle.js +++ b/public/react/src/modules/ec/ecTitle/ecTitle.js @@ -49,16 +49,20 @@ class EcTitleCourseEvaluations extends Component { 4 毕业要求 vs 通用标准 +
  • + 5 + 学生 +
  • - 5 + 6 课程体系
  • - 6 + 7 课程体系 vs 毕业要求
  • - 7 + 8 达成度评价结果
    • {/*
  • */}