diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 0679d524..66d88006 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,9 +85,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue index 3ff62809..d53e1e3e 100644 --- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue +++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue @@ -5,20 +5,20 @@
- + - + - - 新增考试 - 查询 + + 新增考试 +
@@ -60,33 +60,39 @@
- - + + - + - - + + 分钟 - - + + 分 - + - + - 手动抽题 - 随机抽题 +
+
+ 手动抽题 +
+
+ 随机抽题 +
+
@@ -151,7 +157,7 @@
- 取 消 + 取 消 确 定
@@ -207,7 +213,7 @@
- 取 消 + 取 消 确 定
@@ -223,7 +229,7 @@

试题名称：{{examDetailInfo.name}}

考试时长：{{examDetailInfo.duration}}

及格分数：{{examDetailInfo.passLine}}

-

考试备注：{{examDetailInfo.remark}}

+

考试备注：{{examDetailInfo.remark}}

@@ -244,7 +250,7 @@ @@ -396,7 +402,7 @@ export default { subjectName:"", }, emActiveTab: 'examRecord', - examManageInfo:{examTotalScore:'100',passScore: '60',questionCount: '100', examPeriod: '2024-05-12 00:00:00-2024-06-01 00:00:00', joinCount: '100',noJoinCount: '2'}, + examManageInfo:{examTotalScore:'100',passScore: 60,questionCount: '100', examPeriod: '2024-05-12 00:00:00-2024-06-01 00:00:00', joinCount: '100',noJoinCount: '2'}, isExamManage: false, // 考试管理开关 examInfoList: [ {examineeName: '123',idCard: '123456789123456789',questionName:'123123123123123123123123',questionType:'单选题',answer:'123123123123123123123123123123123'}, @@ -473,7 +479,6 @@ export default { dialogVisible3: false, //新增三级弹窗 dialogVisible4: false, //考试详情弹窗 workerInfo: { - subdivisionProjectName: '', children: [], id: '', level: 0, @@ -484,6 +489,43 @@ export default { { ruleType: '1', symbol: '+', ruleScore: 3 }, { ruleType: '', symbol: '', ruleScore: '' }, ], + examRules:{ + subjectType: [ + { + required: true, + message: '必填', + trigger: 'blur', + }, + ], + subjectName: [ + { + required: true, + message: '必填', + trigger: 'blur', + }, + ], + examTime: [ + { + required: true, + message: '必填', + trigger: 'blur', + }, + ], + passScore: [ + { + required: true, + message: '必填', + trigger: 'blur', + }, + ], + examMode: [ + { + required: true, + message: '必填', + trigger: 'blur', + }, + ], + }, addEditRules: { subdivisionProjectName: [ { @@ -600,6 +642,14 @@ export default { // this.loadData() // 查询班组及部门 }, methods: { + cancel2(){ + this.examForm.examMode = null + this.dialogVisible2 = false + }, + cancel3(){ + this.examForm.examMode = null + this.dialogVisible3 = false + }, singleChange(){ // 清空选中的值 this.randomQuestion.examSingle.count = null @@ -608,7 +658,6 @@ export default { this.randomQuestion.examMultiple.count = null }, getRandomQuestion(){ - console.log(this.randomQuestion,"random======================") this.randomQueryList = [] let singleRandom = { type:1, @@ -642,8 +691,9 @@ export default { // alert('还未对接口') delPaperApi({ id: obj.id }).then((res) => { if (res.success) { - this.getRecordList() + // this.getRecordList() this.$message.success('删除成功') + this.refreshFn() } else { this.$message({ type: 'error', @@ -864,7 +914,7 @@ export default { } }), radio:this.examForm.examMode == 1 ? this.examAddDetail.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, - multi:this.examForm.examMode == 1 ? this.examAddDetail.questions.filter(item => item.type == 1).length : this.randomQuestion.examMultiple.count, + multi:this.examForm.examMode == 1 ? this.examAddDetail.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, } if (this.title == '新增考试') { @@ -935,10 +985,12 @@ export default { //切换条数 sizeChange(val) { this.pagInfo.pageSize = val + this.getRecordList() }, //切换页数 currentChange(val) { this.pagInfo.pageNo = val + this.getRecordList() }, //切换条数 examSizeChange(val) { @@ -968,7 +1020,10 @@ export default { this.getRandomQuestion() this.dialogVisible3 = false; }, - + refreshFn(){ + this.pagInfo.pageNo = 1 + this.getRecordList() + } }, } @@ -1110,6 +1165,10 @@ export default { .dialogLeft{ width:100%; height:100%; + /deep/ .el-textarea .el-input__count{ + margin: -50px -10px -40px -50px; + background-color: rgb(1, 1, 1, 0); + } // background-color: darkred; /deep/ .el-upload-dragger { width: 230px; diff --git a/src/views/projectFront/examSystem2/examRegulation/examRegulation.vue b/src/views/projectFront/examSystem2/examRegulation/examRegulation.vue index 54091174..768bd90b 100644 --- a/src/views/projectFront/examSystem2/examRegulation/examRegulation.vue +++ b/src/views/projectFront/examSystem2/examRegulation/examRegulation.vue @@ -115,10 +115,10 @@ export default { pageNo: this.pagInfo.pageNo, pageSize: this.pagInfo.pageSize, projectSn: this.$store.state.projectSn, - }).then((result) => { - if (result.success) { - this.tableData = result.result.records - this.pagInfo.total = result.result.total + }).then((res) => { + if (res.success) { + this.tableData = res.result.records + this.pagInfo.total = res.result.total } }) // this.tableData = [ @@ -156,17 +156,17 @@ export default { if (valid) { if (this.title == '新增') { console.log('addEditForm新增', params) - addExamRegulationApi(params).then((result) => { - if (result.success) { - this.$message.success(result.message) + addExamRegulationApi(params).then((res) => { + if (res.success) { + this.$message.success(res.message) this.getList() } }) } else if (this.title == '编辑') { console.log('addEditForm编辑', params) - editExamRegulationApi(params).then((result) => { - if (result.success) { - this.$message.success(result.message) + editExamRegulationApi(params).then((res) => { + if (res.success) { + this.$message.success(res.message) this.getList() } }) @@ -184,9 +184,9 @@ export default { type: 'warning', }).then(() => { obj.isEnable = status - editExamRegulationApi(obj).then((result) => { - if (result.success) { - this.$message.success(result.message) + editExamRegulationApi(obj).then((res) => { + if (res.success) { + this.$message.success(res.message) this.getList() } }) @@ -207,8 +207,9 @@ export default { // alert('还未对接口') deleteExamRegulationApi({ id: obj.id }).then((res) => { if (res.success) { - this.getList() - this.$message.success(result.message) + // this.getList() + this.refresh() + this.$message.success(res.message) } else { this.$message({ type: 'error', diff --git a/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue index 1df75faf..b2ee3b47 100644 --- a/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue +++ b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue @@ -234,7 +234,8 @@ export default { // alert('还未对接口') deleteCourseApi({ id: obj.id }).then((res) => { if (res.success) { - this.getPageCourseApi() + // this.getPageCourseApi() + this.refreshBtn() this.$message.success('删除成功') } else { this.$message({ @@ -403,17 +404,18 @@ export default { this.getPageCourseApi() }, sizeChangeDetail(val) { // pageSize的处理 - this.pagInfoDetail.pageSize = val + this.pagInfo.pageSize = val this.getPageCourseRecord() }, currentChangeDetail(val) { // 当前页pageNo的处理 - this.pagInfoDetail.pageNo = val + this.pagInfo.pageNo = val this.getPageCourseRecord() }, //刷新按钮 refreshBtn() { - this.pagInfoDetail.pageNo = 1; - this.getPageCourseRecord() + this.pagInfo.pageNo = 1; + this.pagInfo.pageSize = 10; + this.getPageCourseApi() }, }, } diff --git a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue index bf49abcc..3640eaea 100644 --- a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue +++ b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue @@ -111,12 +111,12 @@ style="width: 100%; color: #737996" @selection-change="handleCheckedCitiesChange" > - + > -->