From cca23884edf152d05e8ca97669cf3b4b6d8d8192 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Thu, 13 Jan 2022 18:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=8A=A9=E5=90=8E=E7=AB=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E4=B8=8E=E6=8E=A5=E6=94=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 2 +- src/pages/assessment/add/index.vue | 37 ++++++++++++++++++++++-------- src/pages/project/list/index.vue | 6 ++--- src/setting.js | 4 ++-- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index aaaa72f..756b631 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -57,7 +57,7 @@ export default { deleteAssessment: `${host}occupationlab/assessment/deleteAssessment`, // 单个、批量删除 collectPaper: `${host}occupationlab/assessment/collectPaper`, // 收卷（提前结束） schoolCourse: `${host}nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程 - projectListByCourseId: `${host}nakadai/nakadai/curriculum/projectListByCourseId`, // 根据课程id获取实训项目列表 + projectListByCourseId: `${host}occupationlab/projectManage/getSchoolProjectByAssessent`, // 根据课程id获取实训项目列表 // 成绩管理 deleteExperimentalReport: `${host}occupationlab/achievement/deleteExperimentalReport`, // 单个、批量删除实验报告 diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue index 5cbdaed..1d7ebde 100644 --- a/src/pages/assessment/add/index.vue +++ b/src/pages/assessment/add/index.vue @@ -106,13 +106,13 @@ @@ -266,8 +266,8 @@ export default { // console.log(22,this.assFields) this.date = [util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000)), util.formatDate("yyyy-MM-dd hh:mm:ss", new Date(new Date().getTime() + 300000))]; this.form.id && this.getData(); - this.getschoolCourse(); this.recoveryData(); + this.getschoolCourse(); }, beforeDestroy() { if (!this.isToProject) this.setAss({}); @@ -377,21 +377,37 @@ export default { this.$get(this.api.schoolCourse).then(res => { this.curriculumList = res.data; if (this.curriculumList.length) { - this.form.curriculumId = this.curriculumList[0].cid; - for(let i=0;i { console.log(err); }); }, getProjectData() { - this.$get(`${this.api.projectListByCourseId}?cid=${this.form.curriculumId}&permissions=1&projectName=${this.keyword}`).then(res => { + let data={ + pageNum:this.page, + pageSize:this.pageSize, + cid:this.form.curriculumId, + projectName:this.keyword + } + this.$post(this.api.projectListByCourseId,data).then(res => { + console.log(res) let { status, data } = res; - if (status === 200 && data) { - let list = data; + if (status === 200 && data.records) { + let list = data.records; let result = []; list.map(n => { n.enable || result.push(n); @@ -470,6 +486,7 @@ export default { this.$get(`${this.api.getDetailById}?id=${this.form.id}`).then(res => { this.form = res.data; this.formatDuration(); + this.getschoolCourse(); }).catch(err => { }); }, diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue index 2e1175a..6d7ede8 100644 --- a/src/pages/project/list/index.vue +++ b/src/pages/project/list/index.vue @@ -92,8 +92,8 @@ 复制 { + this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.queryData.platformId}`).then(res => { util.successMsg("更新启用状态成功"); this.getData(); }).catch(err => { diff --git a/src/setting.js b/src/setting.js index 9736ae2..23be905 100644 --- a/src/setting.js +++ b/src/setting.js @@ -36,8 +36,8 @@ if (isHh) { } else if (isDev) { jumpPath = "http://192.168.31.154:8087/"; // host = "http://www.occupationlab.com:9000/";//线上 - host = "http://39.108.250.202:9000/"; // 中台测试服 - // host = "http://192.168.31.151:9000/"; // 榕 + // host = "http://39.108.250.202:9000/"; // 中台测试服 + host = "http://192.168.31.151:9000/"; // 榕 // host = "http://192.168.31.125:9000/"; // 坤 // host = 'http://192.168.31.137:9000/'; // 赓 title = "职站服务端管理系统";