diff --git a/src/api/management/exam.js b/src/api/management/exam.js index 0bd53c1a7..dbf029eca 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -90,3 +90,11 @@ export function getExamListByMapIdAndPrdType(mapId, prdType) { params: { prdType: prdType } }); } +/** 更新试卷规则 */ +export function updateExamRule(data) { + return request({ + url: `/api/exam/update/rules`, + method: 'put', + data:data + }); +} diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 810bf8b53..85ac2f3b5 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,14 +3,14 @@ export function getBaseUrl() { if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://114.116.51.125/jlcloud'; + // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 // BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/organization/examManage/index.vue b/src/views/organization/examManage/index.vue index 0424ce711..b1f4ff0a2 100644 --- a/src/views/organization/examManage/index.vue +++ b/src/views/organization/examManage/index.vue @@ -86,6 +86,16 @@ export default { }, tagType: (row) => { return ''; } }, + { + title: '试卷规则状态', + prop: 'abnormal', + type: 'tag', + width: '80', + columnValue: (row) => { + return row.abnormal ? '异常' : '正常'; + }, + tagType: (row) => { return ''; } + }, { title: '开始时间', prop: 'startTime' diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue index 1eb8e3a15..d20741d12 100644 --- a/src/views/publish/examRule/draft/index.vue +++ b/src/views/publish/examRule/draft/index.vue @@ -62,13 +62,13 @@ export default { return this.display == 2; }, isNextStep() { - return this.display == 1 && this.$route.params.mode != 'edit'; + return this.display == 1; }, isUpdate() { - return this.display == 1 && this.$route.params.mode == 'edit'; + return this.$route.params.mode == 'edit'; }, isCreate() { - return this.display == 2; + return this.display == 2 && this.$route.params.mode !== 'edit'; }, isFastCreate() { return this.display == 1 && this.$route.params.mode != 'edit' && Number(this.$route.params.ruleId); @@ -149,7 +149,11 @@ export default { this.$refs.exam.checkedForm('goNextStep'); }, update() { - this.$refs.exam.updateForm(); + if(this.display === 1) { + this.$refs.exam.updateForm(); + } else if (this.display === 2) { + this.$refs.rule.updateOk(); + } }, create() { this.$refs.rule.creatOk(); diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 20a1d6c73..9c5cfe099 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -38,7 +38,7 @@