diff --git a/.env b/.env index e1aa8cf2..7dec4e6b 100644 --- a/.env +++ b/.env @@ -2,12 +2,15 @@ VUE_APP_BASE=/manage # api项目基础url VUE_APP_BASE_API=/manageApi +VUE_APP_BASE_API1=https://u-pre.boe.com/ # systemApi VUE_APP_SYS_API=/systemapi # activityApi VUE_APP_ACT_API=/activityApi # 教师节上传图片文件夹id VUE_APP_PIC_FOLDERID=1147577187794841600 +# 讲师管理上传 +VUE_APP_COURSE_FOLDERID=1298970611096760320 # 教师节上传zip文件夹id VUE_APP_TOOL_FOLDERID=1147577145918910464 #文件路径 diff --git a/.env.boe b/.env.boe index 413ee62d..00a199f5 100644 --- a/.env.boe +++ b/.env.boe @@ -2,8 +2,9 @@ NODE_ENV=boe VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= +# VUE_APP_BOE_API_URL=//u-pre.boe.com -VUE_APP_BOE_API_URL=//u-pre.boe.com +VUE_APP_BOE_API_URL=//pretest.zcwytd.com # 导入学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=coursefile/导入学员模版-1677140876274.xlsx diff --git a/.env.prod b/.env.prod index 7e8fe59a..f31a233a 100644 --- a/.env.prod +++ b/.env.prod @@ -3,6 +3,8 @@ VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi # 教师节上传图片文件夹id VUE_APP_PIC_FOLDERID=1148997110156759040 +# 讲师管理上传 +VUE_APP_COURSE_FOLDERID=1298970611096760320 # 教师节上传zip文件夹id VUE_APP_TOOL_FOLDERID=1148996610925531136 diff --git a/public/template/内部授课记录导入模板.xlsx b/public/template/内部授课记录导入模板.xlsx new file mode 100644 index 00000000..2144d167 Binary files /dev/null and b/public/template/内部授课记录导入模板.xlsx differ diff --git a/public/template/外部授课记录导入模板.xlsx b/public/template/外部授课记录导入模板.xlsx new file mode 100644 index 00000000..756c6679 Binary files /dev/null and b/public/template/外部授课记录导入模板.xlsx differ diff --git a/public/template/讲师费导入模板.xlsx b/public/template/讲师费导入模板.xlsx new file mode 100644 index 00000000..731d8286 Binary files /dev/null and b/public/template/讲师费导入模板.xlsx differ diff --git a/src/App.vue b/src/App.vue index 1a6dcc13..05130012 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,7 +8,11 @@
- + + + + +
@@ -19,7 +23,7 @@ diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue index 34565582..97c8af4e 100644 --- a/src/components/common/CommonAlert.vue +++ b/src/components/common/CommonAlert.vue @@ -22,7 +22,7 @@
{{ content }}
-
+
取消
@@ -30,6 +30,11 @@
确定
+
+
+
关闭
+
+
@@ -64,6 +69,10 @@ const props = defineProps({ type: { type: Number, default: 1 + }, + isCloseBtn: { + type: Boolean, + default: true } }); const types = { diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue new file mode 100644 index 00000000..cf292b80 --- /dev/null +++ b/src/components/lecturer/ImportWork.vue @@ -0,0 +1,646 @@ + + + + + \ No newline at end of file diff --git a/src/components/project/AddApprover.vue b/src/components/project/AddApprover.vue new file mode 100644 index 00000000..6eeac476 --- /dev/null +++ b/src/components/project/AddApprover.vue @@ -0,0 +1,523 @@ + + + diff --git a/src/components/project/AddContent.vue b/src/components/project/AddContent.vue new file mode 100644 index 00000000..a8e3ccfc --- /dev/null +++ b/src/components/project/AddContent.vue @@ -0,0 +1,265 @@ + + + diff --git a/src/components/project/AddOrgContent.vue b/src/components/project/AddOrgContent.vue new file mode 100644 index 00000000..911ca8e7 --- /dev/null +++ b/src/components/project/AddOrgContent.vue @@ -0,0 +1,327 @@ + + + diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue new file mode 100644 index 00000000..554c9809 --- /dev/null +++ b/src/components/project/BatchLecturer.vue @@ -0,0 +1,370 @@ + + + + diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue new file mode 100644 index 00000000..c79b2348 --- /dev/null +++ b/src/components/project/ConfirmLecturer.vue @@ -0,0 +1,660 @@ + + + + diff --git a/src/components/project/Editor.vue b/src/components/project/Editor.vue new file mode 100644 index 00000000..280a8772 --- /dev/null +++ b/src/components/project/Editor.vue @@ -0,0 +1,114 @@ + + + + \ No newline at end of file diff --git a/src/components/project/ImageUpload.vue b/src/components/project/ImageUpload.vue new file mode 100644 index 00000000..5ac21240 --- /dev/null +++ b/src/components/project/ImageUpload.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/src/components/project/ImportWork.vue b/src/components/project/ImportWork.vue new file mode 100644 index 00000000..3d842ade --- /dev/null +++ b/src/components/project/ImportWork.vue @@ -0,0 +1,637 @@ + + + + + \ No newline at end of file diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue new file mode 100644 index 00000000..f82ab7e2 --- /dev/null +++ b/src/components/project/LookExternalLecturer.vue @@ -0,0 +1,432 @@ + + + + \ No newline at end of file diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue new file mode 100644 index 00000000..891b2778 --- /dev/null +++ b/src/components/project/LookInsideLecturer.vue @@ -0,0 +1,569 @@ + + + \ No newline at end of file diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index dd592694..56653ed1 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -16,9 +16,8 @@ v-model:value="labelValue" style="width: 100%" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" - placeholder="请选择归属组织" + :placeholder="placeholder" :labelInValue="true" - allow-clear v-model:treeExpandedKeys="stuTreeExpandedKeys" :loading="orgLoading" :load-data="onLoadData" @@ -46,6 +45,10 @@ const props = defineProps({ type: Boolean, default: false, }, + placeholder: { + type: String, + default: "请选择归属组织" + } }); const emit = defineEmits({}); const stuTreeExpandedKeys = ref([]); diff --git a/src/components/project/ProjectManagerLecturer.vue b/src/components/project/ProjectManagerLecturer.vue new file mode 100644 index 00000000..1cf51527 --- /dev/null +++ b/src/components/project/ProjectManagerLecturer.vue @@ -0,0 +1,108 @@ + + diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 89168346..1572e273 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -29,7 +29,7 @@ diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue new file mode 100644 index 00000000..944be65c --- /dev/null +++ b/src/components/project/SearchTeacher.vue @@ -0,0 +1,435 @@ + + + + + \ No newline at end of file diff --git a/src/components/project/UploadDragger.vue b/src/components/project/UploadDragger.vue new file mode 100644 index 00000000..4d6d866d --- /dev/null +++ b/src/components/project/UploadDragger.vue @@ -0,0 +1,251 @@ + + + diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue new file mode 100644 index 00000000..497636cb --- /dev/null +++ b/src/components/project/lockLecturer.vue @@ -0,0 +1,451 @@ + + + + + diff --git a/src/store/index.js b/src/store/index.js index 502b02cb..1f7e9066 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -28,10 +28,14 @@ export default createStore({ memberInitInfo: [],//学员默认 sysType: [],//学员默认 menus: [], - sysTypeMap:null + sysTypeMap:null, + isInclude: [], }, getters: {}, mutations: { + setShouInclude(state, value) { + state.isInclude = value; + }, chengeOpenpages(state, list) { // console.log('list', list) state.openpages = list; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cf82f742..e6f1a79c 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1150,7 +1150,7 @@
- 是否允许公开报名 + 是否允许未报名的学员扫码签到、扫码评估
diff --git a/src/views/lecturer/CostDetails.vue b/src/views/lecturer/CostDetails.vue new file mode 100644 index 00000000..63805870 --- /dev/null +++ b/src/views/lecturer/CostDetails.vue @@ -0,0 +1,564 @@ + + + + + diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue new file mode 100644 index 00000000..6711ea61 --- /dev/null +++ b/src/views/lecturer/ExternalLecturer.vue @@ -0,0 +1,1233 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue new file mode 100644 index 00000000..ede8b5c5 --- /dev/null +++ b/src/views/lecturer/ExternalTeaching.vue @@ -0,0 +1,1332 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/ExternalTeachingDetail.vue b/src/views/lecturer/ExternalTeachingDetail.vue new file mode 100644 index 00000000..9d9eac3b --- /dev/null +++ b/src/views/lecturer/ExternalTeachingDetail.vue @@ -0,0 +1,968 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue new file mode 100644 index 00000000..a33b9c9e --- /dev/null +++ b/src/views/lecturer/InsideLecturer.vue @@ -0,0 +1,2146 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue new file mode 100644 index 00000000..7a50af3a --- /dev/null +++ b/src/views/lecturer/InsideTeaching.vue @@ -0,0 +1,1768 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/InsideTeachingDetail.vue b/src/views/lecturer/InsideTeachingDetail.vue new file mode 100644 index 00000000..2cc43129 --- /dev/null +++ b/src/views/lecturer/InsideTeachingDetail.vue @@ -0,0 +1,976 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue new file mode 100644 index 00000000..2e92dfa9 --- /dev/null +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -0,0 +1,1127 @@ + + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue new file mode 100644 index 00000000..adf37bd9 --- /dev/null +++ b/src/views/lecturer/LecturerApproval.vue @@ -0,0 +1,1459 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue new file mode 100644 index 00000000..d6cb93b0 --- /dev/null +++ b/src/views/lecturer/LecturerFee.vue @@ -0,0 +1,2084 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue new file mode 100644 index 00000000..76f2aabb --- /dev/null +++ b/src/views/lecturer/LecturerFeeManagement.vue @@ -0,0 +1,332 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue new file mode 100644 index 00000000..01496737 --- /dev/null +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -0,0 +1,1160 @@ + + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerList.vue b/src/views/lecturer/LecturerList.vue new file mode 100644 index 00000000..bacec5b3 --- /dev/null +++ b/src/views/lecturer/LecturerList.vue @@ -0,0 +1,324 @@ + + + + + \ No newline at end of file diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue new file mode 100644 index 00000000..381f95f2 --- /dev/null +++ b/src/views/lecturer/LecturerSystem.vue @@ -0,0 +1,863 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue new file mode 100644 index 00000000..6e6aaf7e --- /dev/null +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -0,0 +1,438 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue new file mode 100644 index 00000000..30dacaf2 --- /dev/null +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -0,0 +1,584 @@ + + + \ No newline at end of file diff --git a/src/views/lecturer/LookLecturerSystem.vue b/src/views/lecturer/LookLecturerSystem.vue new file mode 100644 index 00000000..e616ab20 --- /dev/null +++ b/src/views/lecturer/LookLecturerSystem.vue @@ -0,0 +1,265 @@ + +ExternalLecturer + + + \ No newline at end of file diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue new file mode 100644 index 00000000..4793d202 --- /dev/null +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -0,0 +1,1027 @@ + + + + + \ No newline at end of file diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue new file mode 100644 index 00000000..95fa67fc --- /dev/null +++ b/src/views/lecturer/Organization.vue @@ -0,0 +1,1183 @@ + + + + \ No newline at end of file diff --git a/src/views/lecturer/TeachingRecord.vue b/src/views/lecturer/TeachingRecord.vue new file mode 100644 index 00000000..4134ae6b --- /dev/null +++ b/src/views/lecturer/TeachingRecord.vue @@ -0,0 +1,315 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/AddOrgContent.vue b/src/views/projectcenter/AddOrgContent.vue new file mode 100644 index 00000000..4eb375ef --- /dev/null +++ b/src/views/projectcenter/AddOrgContent.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/projectcenter/ProjectManage copy.vue b/src/views/projectcenter/ProjectManage copy.vue new file mode 100644 index 00000000..0bec868e --- /dev/null +++ b/src/views/projectcenter/ProjectManage copy.vue @@ -0,0 +1,2721 @@ + + + + diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 244eb547..0bec868e 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -8,7 +8,7 @@ @@ -297,6 +297,7 @@ style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" /> +
项目名称:
diff --git a/src/views/projectcenter/ProjectManagerOutTeacher.vue b/src/views/projectcenter/ProjectManagerOutTeacher.vue new file mode 100644 index 00000000..2cbbfb6b --- /dev/null +++ b/src/views/projectcenter/ProjectManagerOutTeacher.vue @@ -0,0 +1,130 @@ + + diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 1fb4afa2..f59631ae 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -56,14 +56,19 @@ shan
- + > --> +