diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/book.svg b/src/views/screenAdaptation/assets/images/teachingCenter/book.svg
new file mode 100644
index 0000000..6b9208c
--- /dev/null
+++ b/src/views/screenAdaptation/assets/images/teachingCenter/book.svg
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/curriculum.png b/src/views/screenAdaptation/assets/images/teachingCenter/curriculum.png
new file mode 100644
index 0000000..045e8cd
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/teachingCenter/curriculum.png differ
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/img01.png b/src/views/screenAdaptation/assets/images/teachingCenter/img01.png
new file mode 100644
index 0000000..a3d5556
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/teachingCenter/img01.png differ
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/img02.png b/src/views/screenAdaptation/assets/images/teachingCenter/img02.png
new file mode 100644
index 0000000..a66cef9
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/teachingCenter/img02.png differ
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/img03.png b/src/views/screenAdaptation/assets/images/teachingCenter/img03.png
new file mode 100644
index 0000000..a52dd9b
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/teachingCenter/img03.png differ
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/img04.png b/src/views/screenAdaptation/assets/images/teachingCenter/img04.png
new file mode 100644
index 0000000..68ddff2
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/teachingCenter/img04.png differ
diff --git a/src/views/screenAdaptation/assets/images/teachingCenter/time.svg b/src/views/screenAdaptation/assets/images/teachingCenter/time.svg
new file mode 100644
index 0000000..877bfc8
--- /dev/null
+++ b/src/views/screenAdaptation/assets/images/teachingCenter/time.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLargebf.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLargebf.vue
deleted file mode 100644
index fd392ad..0000000
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLargebf.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js
index 3246a41..40dee43 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/interConfig.js
@@ -474,6 +474,44 @@ const InterfaceConfig = {
isTestLogin: true,
},
+ /*
+ * 根据学段、年级获取课程计划信息列表-分页 (新版)
+ "bureau_id":"必填 int 机构id"
+ "stage_id":"必填 int 学段id"
+ "create_year":"必填 int 入学年份(年级)"
+ * */
+ "getCourseArrangementList":{
+ url: 'intellioa/center/courseArrangement/list',
+ method: 'get',
+ isTestLogin: true,
+ },
+ /*
+ * 根据ID获取课程安排信息 (新版)
+ "id"
+ * */
+ "getCourseArrangementInfo":{
+ url: 'intellioa/center/courseArrangement/get',
+ method: 'get',
+ isTestLogin: true,
+ },
+ /*
+ * 删除课程安排 (新版)
+ "id"
+ * */
+ "deleteCourseArrangement":{
+ url: 'intellioa/center/courseArrangement/delete',
+ method: 'post',
+ isTestLogin: true,
+ },
+ /*
+ * 新增(编辑)课程 (新版)
+ * */
+ "saveCourseArrangement":{
+ url: 'intellioa/center/courseArrangement/save',
+ method: 'post',
+ isTestLogin: true,
+ },
+
/*
* 新增、修改保存课程计划信息(单条)
* "plan_id":"非必填,number,课程计划id,填写即修改"
@@ -1513,5 +1551,44 @@ const InterfaceConfig = {
method: 'post',
isTestLogin: true,
},
+
+ /*
+ * 校本课程列表-支持分页
+ * */
+ "getSchoolCourseList":{
+ url: 'intellioa/center/schoolCourse/list',
+ method: 'get',
+ isTestLogin: true,
+ },
+
+ /*
+ * 删除校本课程 (新版)
+ "id"
+ * */
+ "deleteSchoolCourse":{
+ url: 'intellioa/center/schoolCourse/delete',
+ method: 'post',
+ isTestLogin: true,
+ },
+
+ /*
+ * 根据ID获取校本课程信息
+ "id"
+ * */
+ "getSchoolCourseInfo":{
+ url: 'intellioa/center/schoolCourse/get',
+ method: 'get',
+ isTestLogin: true,
+ },
+
+ /*
+ * 保存校本课程(新增/修改)
+ * */
+ "saveSchoolCourse":{
+ url: 'intellioa/center/schoolCourse/save',
+ method: 'post',
+ isTestLogin: true,
+ },
+
};
export default InterfaceConfig;
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
index b4bb2e2..48c1720 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
@@ -2,13 +2,23 @@
-
* 学段学年:
+
* 学段:
-
-
+
+
+ {{ item.stage_name }}
+
+
+
+
+
+
* 入学年份:
+
+
+
+ {{ item.createYearName }}
+
+
@@ -39,80 +49,104 @@
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
index 3c82759..17a8ee3 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
@@ -2,22 +2,32 @@
-
-
+
学段
+
+
+ {{ item.stage_name }}
+
+
+
入学年份
+
+
+ {{ item.createYearName }}
+
+
+
课程名称
+
+
新增
-
+
- ~
+ v-if="record.match_degree > 0"/>
+ ~
+ v-if="record.match_degree < 0"/>
编辑
@@ -25,6 +35,7 @@
删除
+
-
+
@@ -297,38 +308,40 @@
height: auto;
padding: 0.5rem;
- .search-and-add-style {
- width: 100%;
- height: 3.5rem;
- background-color: white;
- margin-bottom: 0.5rem;
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 0.5rem;
-
- .ant-select {
- width: 100px;
- }
-
- .add-button-style {
- float: right;
- }
-
- }
- .ant-table-wrapper {
+ .search-and-add-style {
+ width: 100%;
+ height: 3.5rem;
+ background-color: white;
+ margin-bottom: 0.5rem;
+ display: flex;
+ align-items: center;
+ padding: 0 0.5rem;
+ position: relative;
+ .ant-select {
+ width: 100px;
+ margin-right: 0.5rem;
+ }
+ .ant-input {
+ width: 150px;
+ }
+ .add-button-style {
+ position: absolute;
+ right: 0.5rem;
+ }
+ }
+ .ant-table-wrapper {
- /deep/ .upload-container-style {
- display: flex;
- justify-content: center;
- align-items: center;
- }
+ /deep/ .upload-container-style {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
- }
- .ant-pagination {
- margin-top: 0.5rem;
- text-align: right;
- }
+ }
+ .ant-pagination {
+ margin-top: 0.5rem;
+ text-align: right;
+ }
}
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/schoolBaseCourse.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/schoolBaseCourse.vue
new file mode 100644
index 0000000..806a6ac
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/schoolBaseCourse.vue
@@ -0,0 +1,263 @@
+
+
+
+
+
课程类型
+
+
+ {{ item.type_name }}
+
+
+
课程分类
+
+
+ {{ item.course_name }}
+
+
+
课程名称
+
+
+
新增
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+ 是否确定删除此条信息?
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/shoolBaseCourseInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/shoolBaseCourseInfo.vue
new file mode 100644
index 0000000..045491b
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/shoolBaseCourseInfo.vue
@@ -0,0 +1,380 @@
+
+
+
+
+
+
+
* 课程类型:
+
+
+
+ {{ item.type_name }}
+
+
+
+
+
+
* 课程分类:
+
+
+
+ {{ item.course_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
index efde5c1..7f7065e 100644
--- a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
+++ b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
@@ -265,6 +265,14 @@ export const systemCenterConfig = [
},
{
id: "teaching-2",
+ title: "校本课程",
+ path: '/workBench/servicePlatform/schoolBaseCourse/:id/:name/:menuId',
+ name: 'schoolBaseCourse',
+ component: () => import("./servicePlatform/teachingAdmin/schoolBaseCourse.vue"),
+ props: true,
+ },
+ {
+ id: "teaching-3",
title: "科研活动",
path: '/workBench/servicePlatform/scienceActivity/:id/:name/:menuId',
name: 'scienceActivity',
@@ -272,7 +280,7 @@ export const systemCenterConfig = [
props: true,
},
{
- id: "teaching-3",
+ id: "teaching-4",
title: "活动分类",
path: '/workBench/servicePlatform/activityCategory/:id/:name/:menuId',
name: 'activityCategory',
diff --git a/src/views/screenAdaptation/pages/teachingCenter/schoolBaseCourse.vue b/src/views/screenAdaptation/pages/teachingCenter/schoolBaseCourse.vue
index c928073..960ac75 100644
--- a/src/views/screenAdaptation/pages/teachingCenter/schoolBaseCourse.vue
+++ b/src/views/screenAdaptation/pages/teachingCenter/schoolBaseCourse.vue
@@ -15,7 +15,8 @@
-
+
社团风采
@@ -23,10 +24,12 @@
-
科技社团
+
科技社团
-
+
{{item.title}}
@@ -35,10 +38,12 @@
-
艺术社团
+
艺术社团
-
+
{{item.title}}
@@ -47,10 +52,12 @@
-
体育社团
+
体育社团
-
+
{{item.title}}
@@ -73,12 +80,77 @@
-
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+ {{item.title}}
+
+
+
-
+
+
+
+ {{'《' + item.title + '》'}}
+
+
+
+
+
+ {{'《' + currentBaseData.title + '》'}}
+
+
+
+
+
+
+
+
+ 主讲教师:
+ {{currentBaseData.teacherName}}
+
+
+ 授课时间:
+ {{currentBaseData.teachingTime}}
+
+
+ 授课地点:
+ {{currentBaseData.teachingPlace}}
+
+
+ 授课对象:
+ {{currentBaseData.teachingObject}}
+
+
@@ -88,10 +160,11 @@
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/teachingCenter/teachingActivities.vue b/src/views/screenAdaptation/pages/teachingCenter/teachingActivities.vue
index 1413faf..16a0cc2 100644
--- a/src/views/screenAdaptation/pages/teachingCenter/teachingActivities.vue
+++ b/src/views/screenAdaptation/pages/teachingCenter/teachingActivities.vue
@@ -1,14 +1,26 @@
-
+
+
+
+
{{'《' + item.title + '》'}}
+
+
+ {{item.time}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/teachingCenter/testArrangement.vue b/src/views/screenAdaptation/pages/teachingCenter/testArrangement.vue
index f510826..19bbeb3 100644
--- a/src/views/screenAdaptation/pages/teachingCenter/testArrangement.vue
+++ b/src/views/screenAdaptation/pages/teachingCenter/testArrangement.vue
@@ -1,35 +1,143 @@
-
+
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
+ {{item.gradeName}}
+ {{item.testTitle}}
+ {{item.testTime}}
+
+
+
\ No newline at end of file