diff --git a/src/setting.js b/src/setting.js index 2278fe9..ab9dacd 100644 --- a/src/setting.js +++ b/src/setting.js @@ -14,7 +14,7 @@ if (isDev) { sandPath = `http://${location.hostname}:9520` host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://dev.huorantech.cn/'] + const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/'] host = ips[+localStorage.getItem('ip')] } else if (isPro) { sandPath = `https://izhixinyun.com/sandbox` diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index c3049c2..951fc84 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -106,13 +106,13 @@ @selection-change="handleSelectionPractice"> - - - + - {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }} + {{ scope.row.projectName || scope.row.paperName }} + + - - - + - {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }} + {{ scope.row.projectName || scope.row.paperName }} + + - - + - {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }} + {{ scope.row.projectName || scope.row.paperName }} + checkAllChange(val, projects[0].systemId)"> projectChange(val, item)"> @@ -287,18 +287,18 @@ v-model.trim="checkedKeyword" clearable> - + + - {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }} + {{ scope.row.type === 1 ? '流程类' : scope.row.type === 3 ? '理论' : '编程类' }} - + + - {{ scope.row.type ? '流程类' : '编程类' }} + {{ scope.row.projectName || scope.row.paperName }} - - e.projectId == item.projectId && e.systemId == systemId) + const { systemId, paperId } = item + const i = this.checkeds.findIndex(e => (e.projectId == item.projectId && e.systemId == systemId) || e.paperId == paperId) // 选中,则push,否则移除 if (val) { this.checkeds.push(item) @@ -822,7 +822,8 @@ export default { form.systemIdByPractice = this.practiceData.map(i => { let obj = { isShow: i.isShow, - projectId: i.projectId, + projectId: i.projectId || '', + paperId: i.paperId || '', sort: Number(i.sort), systemId: i.systemId }; @@ -838,6 +839,7 @@ export default { let obj = { isShow: i.isShow, projectId: i.projectId, + paperId: i.paperId || '', sort: Number(i.sort), systemId: i.systemId }; @@ -850,6 +852,7 @@ export default { let obj = { isShow: i.isShow, projectId: i.projectId, + paperId: i.paperId || '', sort: Number(i.sort), systemId: i.systemId }; @@ -864,6 +867,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) + debugger if (form.cid) { this.$post(this.api.modifyCourse, form).then((res) => { this.$message.success("编辑成功"); diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue index c2d80e3..a377892 100644 --- a/src/views/match/manage/matchInfo.vue +++ b/src/views/match/manage/matchInfo.vue @@ -150,6 +150,7 @@ + diff --git a/src/views/setting/info.vue b/src/views/setting/info.vue index 75847d2..bf7efa2 100644 --- a/src/views/setting/info.vue +++ b/src/views/setting/info.vue @@ -191,8 +191,8 @@ - {{ emailBtnText }} + {{ + emailBtnText }} @@ -211,8 +211,8 @@ - {{ phoneBtnText }} + {{ + phoneBtnText }}