diff --git a/src/api/company.js b/src/api/company.js index e8b30f430..2b4a12d1d 100644 --- a/src/api/company.js +++ b/src/api/company.js @@ -227,21 +227,6 @@ export function createStudent(orgId, data) { data }); } -/** 获取班级关联课程 */ -export function getClassAssociatedLessons(orgId) { - return request({ - url: `/api/company/orgLesson/${orgId}/list`, - method: 'get' - }); -} -/** 关联课程班级 */ -export function setClassAssociatedLessons(orgId, data) { - return request({ - url: `/api/company/orgLesson/${orgId}/update`, - method: 'put', - data - }); -} /** 创建修改 规则 */ export function createRule(data) { return request({ @@ -309,21 +294,6 @@ export function getCanApplyToList(ruleId) { method: 'get' }); } -/** 给班级安排考试 */ -export function applyExamToClass(clsId, data) { - return request({ - url: `/api/company/orgExam/${clsId}`, - method: 'post', - data - }); -} -/** 查询班级下的考试 */ -export function getExamListInClass(clsId) { - return request({ - url: `api/company/orgExam/${clsId}/list`, - method: 'get' - }); -} /** 查询组织树结构 */ export function getOrgTreeById(orgId) { return request({ diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue index 5b467e642..2b5f1f568 100644 --- a/src/layout/components/Logout.vue +++ b/src/layout/components/Logout.vue @@ -43,7 +43,7 @@ export default { return this.$store.state.user.companyAdmin; }, isSameProject() { - return this.$store.state.user.companyProject === (getSessionStorage('project').toUpperCase()); + return this.$store.state.user.companyProjectList.includes(getSessionStorage('project').toUpperCase()); } }, mounted() { diff --git a/src/router/index.js b/src/router/index.js index 43de14188..3e20d3ed1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -143,7 +143,6 @@ const PreTheoryImport = () => import('@/views/competitionManage/bankList/preImpo const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule'); const MessageBoard = () => import('@/views/messageBoard/index'); const BoardManage = () => import('@/views/messageBoard/manage'); -const DraftLessonManage = () => import('@/views/teach/draftLessonManage'); const OrganizationManage = () => import('@/views/organization/index'); const OrgClassManage = () => import('@/views/organization/classManage/index'); const OrgDraftLessonManage = () => import('@/views/organization/draftLessonManage/index'); @@ -704,11 +703,6 @@ export const asyncRouter = [ component: TeachDetail, hidden: true }, - { // 草稿课程 - path: 'draftTeach/:subSystem', - component: DraftLessonManage, - hidden: true - }, { // 运行图设计 path: 'runPlan/:mapId', component: PlanMonitorDetail, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 773e9303c..954e29f5f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -20,7 +20,7 @@ const user = { companyId: '', companyAdmin: false, companyName: '', - companyProject: '', + companyProjectList: [], baseUrl:'' }, @@ -61,8 +61,8 @@ const user = { SET_COMPANYNAME: (state, companyName) => { state.companyName = companyName; }, - SET_COMPANYPROJECT: (state, companyProject) => { - state.companyProject = companyProject; + SET_COMPANYPROJECTLIST: (state, companyProjectList) => { + state.companyProjectList = companyProjectList; }, CLEAR_AUTO_PARAMS: () => { Cookies.remove('UserDesignName'); @@ -139,7 +139,7 @@ const user = { commit('SET_COMPANYID', user.companyId); commit('SET_COMPANYADMIN', user.companyAdmin); commit('SET_COMPANYNAME', user.companyName); - commit('SET_COMPANYPROJECT', user.projectCode); + commit('SET_COMPANYPROJECTLIST', user.projectCodes); resolve(user); }).catch(error => { reject(error); diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue index 4d9954fb3..65cb2322e 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue @@ -12,16 +12,6 @@ - - - - - @@ -33,7 +23,6 @@ - diff --git a/src/views/organization/classManage/bindLessons.vue b/src/views/organization/classManage/bindLessons.vue deleted file mode 100644 index c9215e21b..000000000 --- a/src/views/organization/classManage/bindLessons.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - diff --git a/src/views/organization/classManage/index.vue b/src/views/organization/classManage/index.vue index e322b73c5..0dd44194f 100644 --- a/src/views/organization/classManage/index.vue +++ b/src/views/organization/classManage/index.vue @@ -8,22 +8,16 @@ style="width:96%;margin: 0 auto;" /> - - - - diff --git a/src/views/teach/draftDetail.vue b/src/views/teach/draftDetail.vue deleted file mode 100644 index 6e1ed2a27..000000000 --- a/src/views/teach/draftDetail.vue +++ /dev/null @@ -1,524 +0,0 @@ - - - - - diff --git a/src/views/teach/draftLessonManage.vue b/src/views/teach/draftLessonManage.vue deleted file mode 100644 index 350f8a044..000000000 --- a/src/views/teach/draftLessonManage.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue index c945e5f81..56d3d53ee 100644 --- a/src/views/teach/index.vue +++ b/src/views/teach/index.vue @@ -4,7 +4,6 @@
{{ $t('global.lessonSystem') }}
- 草稿课程管理 @@ -137,10 +136,6 @@ export default { this.$messageBox(this.$t('error.updateFailed')); }); }, - draftLessonManage() { - const query = {mapId: this.mapId, prdType: this.prdType, cityCode: this.cityCode}; - this.$router.push({ path: `/trainingPlatform/draftTeach/${this.$route.params.subSystem}`, query: query }); - }, changeInput(val) { localStore.set(this.$route.path, val); }, diff --git a/src/views/teach/operateMenu.vue b/src/views/teach/operateMenu.vue deleted file mode 100644 index d720110cd..000000000 --- a/src/views/teach/operateMenu.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - diff --git a/src/views/teach/sorttree.vue b/src/views/teach/sorttree.vue deleted file mode 100644 index dee6f714f..000000000 --- a/src/views/teach/sorttree.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - -