Commit 861f5e84fff80d5e1bc592ccc11f571178460bb6
1 parent
3587d377
录分设置
Showing
35 changed files
with
144 additions
and
97 deletions
src/api/apis/apis.js
| @@ -885,4 +885,8 @@ export default { | @@ -885,4 +885,8 @@ export default { | ||
| 885 | deviceZipLogList(data) { | 885 | deviceZipLogList(data) { |
| 886 | return defaltService(setUpUrls.deviceZipLogList, data) | 886 | return defaltService(setUpUrls.deviceZipLogList, data) |
| 887 | }, | 887 | }, |
| 888 | + // 获取即时测报表录分情况 | ||
| 889 | + getScoreType(data) { | ||
| 890 | + return defaltService(setUpUrls.getScoreType, data) | ||
| 891 | + }, | ||
| 888 | }; | 892 | }; |
src/api/urls/apis.js
| @@ -446,4 +446,8 @@ export default { | @@ -446,4 +446,8 @@ export default { | ||
| 446 | deviceZipLogList: "/api_html/school/manager/deviceZipLogList", | 446 | deviceZipLogList: "/api_html/school/manager/deviceZipLogList", |
| 447 | 447 | ||
| 448 | 448 | ||
| 449 | + //获取即时测报表录分情况 | ||
| 450 | + getScoreType: "/api_html/teaching/getScoreType", | ||
| 451 | + | ||
| 452 | + | ||
| 449 | } | 453 | } |
src/components/backBox.vue
src/views/basic/analysis/index.vue
| @@ -174,7 +174,6 @@ export default { | @@ -174,7 +174,6 @@ export default { | ||
| 174 | (this.props.lazyLoad = function (node, resolve) { | 174 | (this.props.lazyLoad = function (node, resolve) { |
| 175 | const { level } = node; | 175 | const { level } = node; |
| 176 | if (level == 3) { | 176 | if (level == 3) { |
| 177 | - console.log(node); | ||
| 178 | that.$request | 177 | that.$request |
| 179 | .tenantSubjectList({ | 178 | .tenantSubjectList({ |
| 180 | schoolId: node.path[0], | 179 | schoolId: node.path[0], |
| @@ -246,7 +245,6 @@ export default { | @@ -246,7 +245,6 @@ export default { | ||
| 246 | })[0]; | 245 | })[0]; |
| 247 | }, | 246 | }, |
| 248 | secGraClaSubChange(event, index) { | 247 | secGraClaSubChange(event, index) { |
| 249 | - console.log(event); | ||
| 250 | let txt = ""; | 248 | let txt = ""; |
| 251 | let xx = this.filterObj(this.gradeList, event[0]); | 249 | let xx = this.filterObj(this.gradeList, event[0]); |
| 252 | txt += xx.label; | 250 | txt += xx.label; |
src/views/basic/analysis/indexOld.vue
| @@ -351,7 +351,6 @@ export default { | @@ -351,7 +351,6 @@ export default { | ||
| 351 | } | 351 | } |
| 352 | }); | 352 | }); |
| 353 | }); | 353 | }); |
| 354 | - console.log(dataList); | ||
| 355 | this.tableData = data.map((item) => { | 354 | this.tableData = data.map((item) => { |
| 356 | let params = {}; | 355 | let params = {}; |
| 357 | dataIdsList.map((ids, index) => { | 356 | dataIdsList.map((ids, index) => { |
src/views/basic/ask/analysis.vue
| @@ -137,7 +137,6 @@ export default { | @@ -137,7 +137,6 @@ export default { | ||
| 137 | // this.className = this.$route.query.className; | 137 | // this.className = this.$route.query.className; |
| 138 | const queryData = JSON.parse(this.$route.query.params); | 138 | const queryData = JSON.parse(this.$route.query.params); |
| 139 | this.classIds = this.$route.query.classIds; | 139 | this.classIds = this.$route.query.classIds; |
| 140 | - console.log(this.$route.query); | ||
| 141 | this.subjectNames = this.$route.query.subjectNames.split(","); | 140 | this.subjectNames = this.$route.query.subjectNames.split(","); |
| 142 | if (this.types == 1) { | 141 | if (this.types == 1) { |
| 143 | this.tabList = [ | 142 | this.tabList = [ |
| @@ -315,7 +314,6 @@ export default { | @@ -315,7 +314,6 @@ export default { | ||
| 315 | ...query, | 314 | ...query, |
| 316 | }); | 315 | }); |
| 317 | this.loading = false; | 316 | this.loading = false; |
| 318 | - console.log(data); | ||
| 319 | if (status === 0) { | 317 | if (status === 0) { |
| 320 | this.exportStudent = (data?.list && [...data?.list]) || []; | 318 | this.exportStudent = (data?.list && [...data?.list]) || []; |
| 321 | } else { | 319 | } else { |
src/views/basic/ask/archiving.vue
| @@ -541,7 +541,6 @@ export default { | @@ -541,7 +541,6 @@ export default { | ||
| 541 | let leng = val.length - 1; | 541 | let leng = val.length - 1; |
| 542 | sub = val[leng]; | 542 | sub = val[leng]; |
| 543 | } | 543 | } |
| 544 | - console.log(val); | ||
| 545 | this.query.subjectNames = val.filter((item) => { | 544 | this.query.subjectNames = val.filter((item) => { |
| 546 | return sub != "全部" ? item != "全部" : item == "全部"; | 545 | return sub != "全部" ? item != "全部" : item == "全部"; |
| 547 | }); | 546 | }); |
src/views/basic/ask/index.vue
| @@ -153,7 +153,6 @@ export default { | @@ -153,7 +153,6 @@ export default { | ||
| 153 | this.query.subjectNames = val ? this.subjectList : []; | 153 | this.query.subjectNames = val ? this.subjectList : []; |
| 154 | }, | 154 | }, |
| 155 | handleChecked(value) { | 155 | handleChecked(value) { |
| 156 | - console.log(value); | ||
| 157 | let checkedCount = value.length; | 156 | let checkedCount = value.length; |
| 158 | this.allSubject = checkedCount === this.subjectList.length; | 157 | this.allSubject = checkedCount === this.subjectList.length; |
| 159 | this.isIndeterminate = | 158 | this.isIndeterminate = |
src/views/basic/card/index.vue
| @@ -177,7 +177,6 @@ export default { | @@ -177,7 +177,6 @@ export default { | ||
| 177 | async _QueryGradeList() { | 177 | async _QueryGradeList() { |
| 178 | this.loading = true; | 178 | this.loading = true; |
| 179 | const { data, status, info } = await this.$request.gradeList(); | 179 | const { data, status, info } = await this.$request.gradeList(); |
| 180 | - console.log(status); | ||
| 181 | if (status === 0) { | 180 | if (status === 0) { |
| 182 | if (!!data.list) { | 181 | if (!!data.list) { |
| 183 | this.gradeList = | 182 | this.gradeList = |
| @@ -272,7 +271,6 @@ export default { | @@ -272,7 +271,6 @@ export default { | ||
| 272 | size: 20, | 271 | size: 20, |
| 273 | }); | 272 | }); |
| 274 | this.loading = false; | 273 | this.loading = false; |
| 275 | - console.log(status); | ||
| 276 | if (status === 0) { | 274 | if (status === 0) { |
| 277 | this.tableData = data.list || []; | 275 | this.tableData = data.list || []; |
| 278 | this.total = data.count; | 276 | this.total = data.count; |
src/views/basic/dataSync/index.vue
| @@ -98,7 +98,6 @@ export default { | @@ -98,7 +98,6 @@ export default { | ||
| 98 | query.exportData = formatDate(times, "yyyy-MM-dd"); | 98 | query.exportData = formatDate(times, "yyyy-MM-dd"); |
| 99 | query.exportData = query.exportData.replaceAll("-", "") | 99 | query.exportData = query.exportData.replaceAll("-", "") |
| 100 | } | 100 | } |
| 101 | - console.log({ ...query }) | ||
| 102 | const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData | 101 | const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData |
| 103 | const data = await exportData({ ...query }); | 102 | const data = await exportData({ ...query }); |
| 104 | this.downLoading = false; | 103 | this.downLoading = false; |
src/views/basic/device/index.vue
| @@ -899,7 +899,6 @@ export default { | @@ -899,7 +899,6 @@ export default { | ||
| 899 | this._QueryData(false); | 899 | this._QueryData(false); |
| 900 | }, | 900 | }, |
| 901 | handleSelectionChange(val) { | 901 | handleSelectionChange(val) { |
| 902 | - console.log(val); | ||
| 903 | this.selectionTabIds = val.map((item) => { | 902 | this.selectionTabIds = val.map((item) => { |
| 904 | return item.id; | 903 | return item.id; |
| 905 | }); | 904 | }); |
| @@ -908,7 +907,6 @@ export default { | @@ -908,7 +907,6 @@ export default { | ||
| 908 | this._ModifyUpgradeFlagBySchool(); | 907 | this._ModifyUpgradeFlagBySchool(); |
| 909 | }, 800), | 908 | }, 800), |
| 910 | changeUpdate: _.debounce(function (event, obj) { | 909 | changeUpdate: _.debounce(function (event, obj) { |
| 911 | - console.log(this); | ||
| 912 | if (event) { | 910 | if (event) { |
| 913 | this.autoUpDate(obj.id); | 911 | this.autoUpDate(obj.id); |
| 914 | } else { | 912 | } else { |
| @@ -1115,7 +1113,6 @@ export default { | @@ -1115,7 +1113,6 @@ export default { | ||
| 1115 | ...query, | 1113 | ...query, |
| 1116 | }); | 1114 | }); |
| 1117 | this.loadingAnswerEqu = false; | 1115 | this.loadingAnswerEqu = false; |
| 1118 | - console.log(status); | ||
| 1119 | if (status === 0) { | 1116 | if (status === 0) { |
| 1120 | this.diaAnswerEqu = false; | 1117 | this.diaAnswerEqu = false; |
| 1121 | this.$message.success(info); | 1118 | this.$message.success(info); |
src/views/basic/down/client.vue
| @@ -407,7 +407,6 @@ export default { | @@ -407,7 +407,6 @@ export default { | ||
| 407 | methods: { | 407 | methods: { |
| 408 | setConfigForm(obj) { | 408 | setConfigForm(obj) { |
| 409 | let content = JSON.parse(obj.content); | 409 | let content = JSON.parse(obj.content); |
| 410 | - console.log(content); | ||
| 411 | this.formData.configName = obj.configName; | 410 | this.formData.configName = obj.configName; |
| 412 | for (let key in this.formData) { | 411 | for (let key in this.formData) { |
| 413 | content[key] ? (this.formData[key] = content[key]) : ""; | 412 | content[key] ? (this.formData[key] = content[key]) : ""; |
src/views/basic/setUp/PersonalStudent.vue
| @@ -395,7 +395,6 @@ export default { | @@ -395,7 +395,6 @@ export default { | ||
| 395 | let hasName = this.studentList.find((item) => { | 395 | let hasName = this.studentList.find((item) => { |
| 396 | return item.studentName == this.formStu.studentName; | 396 | return item.studentName == this.formStu.studentName; |
| 397 | }); | 397 | }); |
| 398 | - console.log(hasName); | ||
| 399 | if (hasName) { | 398 | if (hasName) { |
| 400 | this.$message.warning("学生姓名已存在"); | 399 | this.$message.warning("学生姓名已存在"); |
| 401 | return; | 400 | return; |
| @@ -405,7 +404,6 @@ export default { | @@ -405,7 +404,6 @@ export default { | ||
| 405 | ...query, | 404 | ...query, |
| 406 | }); | 405 | }); |
| 407 | this.loading = false; | 406 | this.loading = false; |
| 408 | - console.log(status); | ||
| 409 | if (status === 0) { | 407 | if (status === 0) { |
| 410 | this.$message.success(info); | 408 | this.$message.success(info); |
| 411 | this.diaStu = false; | 409 | this.diaStu = false; |
| @@ -425,7 +423,7 @@ export default { | @@ -425,7 +423,7 @@ export default { | ||
| 425 | ...this.query, | 423 | ...this.query, |
| 426 | }); | 424 | }); |
| 427 | this.loading = false; | 425 | this.loading = false; |
| 428 | - console.log(status); | 426 | + |
| 429 | if (status === 0) { | 427 | if (status === 0) { |
| 430 | this.studentList = data.list || []; | 428 | this.studentList = data.list || []; |
| 431 | } else { | 429 | } else { |
src/views/basic/setUp/account.vue
| @@ -536,7 +536,6 @@ export default { | @@ -536,7 +536,6 @@ export default { | ||
| 536 | this.diaCount = true; | 536 | this.diaCount = true; |
| 537 | }, | 537 | }, |
| 538 | handleDropdownClick(value, item) { | 538 | handleDropdownClick(value, item) { |
| 539 | - console.log(item); | ||
| 540 | //更多 | 539 | //更多 |
| 541 | if (value == 2) { | 540 | if (value == 2) { |
| 542 | this.$confirm("确定要删除这条账号信息吗?", "提示", { | 541 | this.$confirm("确定要删除这条账号信息吗?", "提示", { |
| @@ -605,7 +604,6 @@ export default { | @@ -605,7 +604,6 @@ export default { | ||
| 605 | }, | 604 | }, |
| 606 | async updateUser(obj, type) { | 605 | async updateUser(obj, type) { |
| 607 | let query = {}; | 606 | let query = {}; |
| 608 | - console.log(query); | ||
| 609 | if (type == 1) { | 607 | if (type == 1) { |
| 610 | query.available = obj.available == 0 ? 1 : 0; | 608 | query.available = obj.available == 0 ? 1 : 0; |
| 611 | } | 609 | } |
src/views/basic/setUp/conglomerate.vue
| @@ -372,7 +372,6 @@ export default { | @@ -372,7 +372,6 @@ export default { | ||
| 372 | async _QuerySectionList() { | 372 | async _QuerySectionList() { |
| 373 | //学校学段 | 373 | //学校学段 |
| 374 | const { data, status, info } = await this.$request.sectionList(); | 374 | const { data, status, info } = await this.$request.sectionList(); |
| 375 | - console.log(status); | ||
| 376 | if (status === 0) { | 375 | if (status === 0) { |
| 377 | this.sectionsList = data?.list || []; | 376 | this.sectionsList = data?.list || []; |
| 378 | } else { | 377 | } else { |
src/views/basic/setUp/school.vue
| @@ -277,7 +277,7 @@ export default { | @@ -277,7 +277,7 @@ export default { | ||
| 277 | async _QuerySectionList() { | 277 | async _QuerySectionList() { |
| 278 | //学校学段 | 278 | //学校学段 |
| 279 | const { data, status, info } = await this.$request.sectionList(); | 279 | const { data, status, info } = await this.$request.sectionList(); |
| 280 | - console.log(status); | 280 | + |
| 281 | if (status === 0) { | 281 | if (status === 0) { |
| 282 | this.sectionsList = data?.list || []; | 282 | this.sectionsList = data?.list || []; |
| 283 | } else { | 283 | } else { |
| @@ -294,7 +294,6 @@ export default { | @@ -294,7 +294,6 @@ export default { | ||
| 294 | for (let key in this.formSchool) { | 294 | for (let key in this.formSchool) { |
| 295 | if (key == "sections") { | 295 | if (key == "sections") { |
| 296 | this.formSchool.sections = data[key].split(",").map((item) => { | 296 | this.formSchool.sections = data[key].split(",").map((item) => { |
| 297 | - console.log(Number(item)); | ||
| 298 | return Number(item); | 297 | return Number(item); |
| 299 | }); | 298 | }); |
| 300 | } else { | 299 | } else { |
| @@ -310,7 +309,7 @@ export default { | @@ -310,7 +309,7 @@ export default { | ||
| 310 | this.loading = true; | 309 | this.loading = true; |
| 311 | const { data, status, info } = await this.$request.gradeList(); | 310 | const { data, status, info } = await this.$request.gradeList(); |
| 312 | this.loading = false; | 311 | this.loading = false; |
| 313 | - console.log(status); | 312 | + |
| 314 | if (status === 0) { | 313 | if (status === 0) { |
| 315 | this.tableData = data.list || []; | 314 | this.tableData = data.list || []; |
| 316 | } else { | 315 | } else { |
src/views/basic/setUp/student.vue
| @@ -540,7 +540,6 @@ export default { | @@ -540,7 +540,6 @@ export default { | ||
| 540 | let hasName = this.studentList.find((item) => { | 540 | let hasName = this.studentList.find((item) => { |
| 541 | return item.studentName == this.formStu.studentName; | 541 | return item.studentName == this.formStu.studentName; |
| 542 | }); | 542 | }); |
| 543 | - console.log(hasName); | ||
| 544 | if (hasName) { | 543 | if (hasName) { |
| 545 | this.$message.warning("学生姓名已存在"); | 544 | this.$message.warning("学生姓名已存在"); |
| 546 | this.loading = false; | 545 | this.loading = false; |
| @@ -551,7 +550,7 @@ export default { | @@ -551,7 +550,7 @@ export default { | ||
| 551 | ...query, | 550 | ...query, |
| 552 | }); | 551 | }); |
| 553 | this.loading = false; | 552 | this.loading = false; |
| 554 | - console.log(status); | 553 | + |
| 555 | if (status === 0) { | 554 | if (status === 0) { |
| 556 | this.$message.success(info); | 555 | this.$message.success(info); |
| 557 | this.diaStu = false; | 556 | this.diaStu = false; |
| @@ -573,7 +572,6 @@ export default { | @@ -573,7 +572,6 @@ export default { | ||
| 573 | }, | 572 | }, |
| 574 | //学生调班弹窗 | 573 | //学生调班弹窗 |
| 575 | openChangeClazz(obj) { | 574 | openChangeClazz(obj) { |
| 576 | - console.log(obj); | ||
| 577 | this.formStuCla.classId = ""; | 575 | this.formStuCla.classId = ""; |
| 578 | this.formStuCla.studentId = obj.id; | 576 | this.formStuCla.studentId = obj.id; |
| 579 | this.formStuCla.classList = obj.classList || []; | 577 | this.formStuCla.classList = obj.classList || []; |
| @@ -723,7 +721,7 @@ export default { | @@ -723,7 +721,7 @@ export default { | ||
| 723 | ...query, | 721 | ...query, |
| 724 | }); | 722 | }); |
| 725 | this.loading = false; | 723 | this.loading = false; |
| 726 | - console.log(status); | 724 | + |
| 727 | if (status === 0) { | 725 | if (status === 0) { |
| 728 | this.studentList = (data.list && [...data?.list]) || []; | 726 | this.studentList = (data.list && [...data?.list]) || []; |
| 729 | } else { | 727 | } else { |
| @@ -768,7 +766,6 @@ export default { | @@ -768,7 +766,6 @@ export default { | ||
| 768 | let classType = ""; | 766 | let classType = ""; |
| 769 | this.formStuCla.classList.map((item) => { | 767 | this.formStuCla.classList.map((item) => { |
| 770 | if (this.formStuCla.oldClassId == item.id) { | 768 | if (this.formStuCla.oldClassId == item.id) { |
| 771 | - console.log(item); | ||
| 772 | classType = item.classType; | 769 | classType = item.classType; |
| 773 | grade = item.grade; | 770 | grade = item.grade; |
| 774 | } | 771 | } |
src/views/basic/setUp/teacher.vue
| @@ -722,7 +722,6 @@ export default { | @@ -722,7 +722,6 @@ export default { | ||
| 722 | this.$message.error(res.info); | 722 | this.$message.error(res.info); |
| 723 | } | 723 | } |
| 724 | } else { | 724 | } else { |
| 725 | - console.log(valid); | ||
| 726 | this.$message.warning("输入有误请检查!"); | 725 | this.$message.warning("输入有误请检查!"); |
| 727 | return false; | 726 | return false; |
| 728 | } | 727 | } |
| @@ -973,7 +972,7 @@ export default { | @@ -973,7 +972,7 @@ export default { | ||
| 973 | ...query, | 972 | ...query, |
| 974 | }); | 973 | }); |
| 975 | this.loading = false; | 974 | this.loading = false; |
| 976 | - console.log(status); | 975 | + |
| 977 | if (status === 0) { | 976 | if (status === 0) { |
| 978 | this.teacherList = data.list || []; | 977 | this.teacherList = data.list || []; |
| 979 | if (type == 10) { | 978 | if (type == 10) { |
src/views/basic/test/analysis.vue
| @@ -77,15 +77,15 @@ export default { | @@ -77,15 +77,15 @@ export default { | ||
| 77 | this.$store.getters.info.showRole || | 77 | this.$store.getters.info.showRole || |
| 78 | this.$store.getters.info.permissions[0].role; | 78 | this.$store.getters.info.permissions[0].role; |
| 79 | this.id = this.$route.query.id || ""; | 79 | this.id = this.$route.query.id || ""; |
| 80 | - this.examType = this.$route.query.examType || 2; | 80 | + this.examType = Number(this.$route.query.examType || 2); |
| 81 | this.score = Number(this.$route.query.score) || 0; | 81 | this.score = Number(this.$route.query.score) || 0; |
| 82 | this.ids = | 82 | this.ids = |
| 83 | (this.$route.query.ids && this.$route.query.ids.split(",")) || []; | 83 | (this.$route.query.ids && this.$route.query.ids.split(",")) || []; |
| 84 | this.type = this.$route.query.type; | 84 | this.type = this.$route.query.type; |
| 85 | - this.classIds = this.$route.query.classIds || []; | 85 | + this.classIds = this.$route.query.classIds?.split(",") || []; |
| 86 | + console.log(this.classIds); | ||
| 86 | this.title = this.$route.query.title || ""; | 87 | this.title = this.$route.query.title || ""; |
| 87 | this.subjectName = this.$route.query.subjectName || ""; | 88 | this.subjectName = this.$route.query.subjectName || ""; |
| 88 | - console.log(this.classIds) | ||
| 89 | }, | 89 | }, |
| 90 | methods: {}, | 90 | methods: {}, |
| 91 | }; | 91 | }; |
src/views/basic/test/archiving.vue
| @@ -471,7 +471,6 @@ export default { | @@ -471,7 +471,6 @@ export default { | ||
| 471 | let leng = val.length - 1; | 471 | let leng = val.length - 1; |
| 472 | sub = val[leng]; | 472 | sub = val[leng]; |
| 473 | } | 473 | } |
| 474 | - console.log(val); | ||
| 475 | this.query.subjectNames = val.filter((item) => { | 474 | this.query.subjectNames = val.filter((item) => { |
| 476 | return sub != "全部" ? item != "全部" : item == "全部"; | 475 | return sub != "全部" ? item != "全部" : item == "全部"; |
| 477 | }); | 476 | }); |
| @@ -487,7 +486,7 @@ export default { | @@ -487,7 +486,7 @@ export default { | ||
| 487 | status: 1, | 486 | status: 1, |
| 488 | type: 1, //试卷类型 | 487 | type: 1, //试卷类型 |
| 489 | subjectName: obj.subjectName, | 488 | subjectName: obj.subjectName, |
| 490 | - classIds: [obj.classId], | 489 | + classIds: obj.classId, |
| 491 | params: JSON.stringify({ | 490 | params: JSON.stringify({ |
| 492 | ...this.query, | 491 | ...this.query, |
| 493 | subjectNames: [this.query.subjectNames], | 492 | subjectNames: [this.query.subjectNames], |
| @@ -755,7 +754,6 @@ export default { | @@ -755,7 +754,6 @@ export default { | ||
| 755 | } | 754 | } |
| 756 | }); | 755 | }); |
| 757 | }); | 756 | }); |
| 758 | - console.log(dataList); | ||
| 759 | this.tableData = data?.list.map((item) => { | 757 | this.tableData = data?.list.map((item) => { |
| 760 | let params = {}; | 758 | let params = {}; |
| 761 | dataIdsList.map((ids, index) => { | 759 | dataIdsList.map((ids, index) => { |
src/views/basic/test/components/contrast.vue
| @@ -183,7 +183,6 @@ export default { | @@ -183,7 +183,6 @@ export default { | ||
| 183 | ); | 183 | ); |
| 184 | }, | 184 | }, |
| 185 | setType(type) { | 185 | setType(type) { |
| 186 | - console.log(this.$refs.main.offsetHeight - 50); | ||
| 187 | this.tableMaxHeight = this.$refs.main.offsetHeight; | 186 | this.tableMaxHeight = this.$refs.main.offsetHeight; |
| 188 | this.type = type; | 187 | this.type = type; |
| 189 | }, | 188 | }, |
src/views/basic/test/components/scoreSet.vue
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | <el-table-column prop="score" label="总得分" align="center" fixed | 43 | <el-table-column prop="score" label="总得分" align="center" fixed |
| 44 | ><template slot-scope="scoped"> | 44 | ><template slot-scope="scoped"> |
| 45 | <el-input | 45 | <el-input |
| 46 | - v-if="scoped.row.isSetScore" | 46 | + v-if="showAllSetScore" |
| 47 | type="number" | 47 | type="number" |
| 48 | :min="0" | 48 | :min="0" |
| 49 | v-model="scoped.row.all" | 49 | v-model="scoped.row.all" |
| @@ -54,21 +54,25 @@ | @@ -54,21 +54,25 @@ | ||
| 54 | <el-table-column prop="objectiveScore" label="客观题分" align="center" | 54 | <el-table-column prop="objectiveScore" label="客观题分" align="center" |
| 55 | ><template slot-scope="scoped"> | 55 | ><template slot-scope="scoped"> |
| 56 | <!-- <el-input | 56 | <!-- <el-input |
| 57 | + v-if="scoped.row.showSetScore" | ||
| 57 | type="number" | 58 | type="number" |
| 58 | :min="0" | 59 | :min="0" |
| 59 | v-model="scoped.row.object" | 60 | v-model="scoped.row.object" |
| 61 | + @input="setOtherScore($event, scoped.row)" | ||
| 60 | ></el-input> --> | 62 | ></el-input> --> |
| 61 | - {{ scoped.row.object }} | 63 | + <template>{{ scoped.row.object }}</template> |
| 62 | </template></el-table-column | 64 | </template></el-table-column |
| 63 | > | 65 | > |
| 64 | <el-table-column prop="subjectiveScore" label="主观题分" align="center"> | 66 | <el-table-column prop="subjectiveScore" label="主观题分" align="center"> |
| 65 | <template slot-scope="scoped"> | 67 | <template slot-scope="scoped"> |
| 66 | <!-- <el-input | 68 | <!-- <el-input |
| 69 | + v-if="scoped.row.showSetScore" | ||
| 67 | type="number" | 70 | type="number" |
| 68 | :min="0" | 71 | :min="0" |
| 69 | v-model="scoped.row.subject" | 72 | v-model="scoped.row.subject" |
| 73 | + @input="setOtherScore($event, scoped.row)" | ||
| 70 | ></el-input> --> | 74 | ></el-input> --> |
| 71 | - {{ scoped.row.subject }} | 75 | + <template>{{ scoped.row.subject }}</template> |
| 72 | </template> | 76 | </template> |
| 73 | </el-table-column> | 77 | </el-table-column> |
| 74 | <!-- <el-table-column v-for="(item, index) in questionList" :key="index" :label="'第' + cNum[index] + '大题'" --> | 78 | <!-- <el-table-column v-for="(item, index) in questionList" :key="index" :label="'第' + cNum[index] + '大题'" --> |
| @@ -80,6 +84,7 @@ | @@ -80,6 +84,7 @@ | ||
| 80 | > | 84 | > |
| 81 | <template slot-scope="scoped"> | 85 | <template slot-scope="scoped"> |
| 82 | <el-input | 86 | <el-input |
| 87 | + v-if="showSetScore" | ||
| 83 | type="number" | 88 | type="number" |
| 84 | :min="0" | 89 | :min="0" |
| 85 | :max="question.questionScore" | 90 | :max="question.questionScore" |
| @@ -94,6 +99,9 @@ | @@ -94,6 +99,9 @@ | ||
| 94 | " | 99 | " |
| 95 | v-model="scoped.row.scoreMap[question.questionId]" | 100 | v-model="scoped.row.scoreMap[question.questionId]" |
| 96 | ></el-input> | 101 | ></el-input> |
| 102 | + <template v-else>{{ | ||
| 103 | + scoped.row.scoreMap[question.questionId] | ||
| 104 | + }}</template> | ||
| 97 | </template> | 105 | </template> |
| 98 | </el-table-column> | 106 | </el-table-column> |
| 99 | </el-table> | 107 | </el-table> |
| @@ -140,6 +148,8 @@ export default { | @@ -140,6 +148,8 @@ export default { | ||
| 140 | default: 0, | 148 | default: 0, |
| 141 | }, | 149 | }, |
| 142 | diaScoreSet: false, | 150 | diaScoreSet: false, |
| 151 | + showAllSetScore: false, | ||
| 152 | + showSetScore: false, | ||
| 143 | }, | 153 | }, |
| 144 | data() { | 154 | data() { |
| 145 | return { | 155 | return { |
| @@ -164,12 +174,12 @@ export default { | @@ -164,12 +174,12 @@ export default { | ||
| 164 | }, | 174 | }, |
| 165 | }, | 175 | }, |
| 166 | methods: { | 176 | methods: { |
| 177 | + //设置小题分 | ||
| 167 | setScore(val, max, obj, questionId, rowData) { | 178 | setScore(val, max, obj, questionId, rowData) { |
| 168 | if (max && Number(val) > Number(max)) { | 179 | if (max && Number(val) > Number(max)) { |
| 169 | obj[questionId] = max; | 180 | obj[questionId] = max; |
| 170 | } | 181 | } |
| 171 | let { score, object, subject } = this.getScore(rowData); | 182 | let { score, object, subject } = this.getScore(rowData); |
| 172 | - rowData.isSetScore = false; | ||
| 173 | rowData.all = score; | 183 | rowData.all = score; |
| 174 | rowData.object = object; | 184 | rowData.object = object; |
| 175 | rowData.subject = subject; | 185 | rowData.subject = subject; |
| @@ -204,9 +214,6 @@ export default { | @@ -204,9 +214,6 @@ export default { | ||
| 204 | } else { | 214 | } else { |
| 205 | let num = Number(obj.scoreMap[keys]); | 215 | let num = Number(obj.scoreMap[keys]); |
| 206 | obj.scoreMap[keys] = num; | 216 | obj.scoreMap[keys] = num; |
| 207 | - if (num > 0) { | ||
| 208 | - this.isSetScore = false; | ||
| 209 | - } | ||
| 210 | score += num; | 217 | score += num; |
| 211 | if (question.questionType == 5) { | 218 | if (question.questionType == 5) { |
| 212 | subject += num; | 219 | subject += num; |
| @@ -245,7 +252,6 @@ export default { | @@ -245,7 +252,6 @@ export default { | ||
| 245 | } | 252 | } |
| 246 | this.tableData = | 253 | this.tableData = |
| 247 | studentList.map((item) => { | 254 | studentList.map((item) => { |
| 248 | - item.isSetScore = true; | ||
| 249 | item.all = item.all || 0; //总分 | 255 | item.all = item.all || 0; //总分 |
| 250 | item.object = item.object || 0; //客观题分数 | 256 | item.object = item.object || 0; //客观题分数 |
| 251 | item.subject = item.subject || 0; //主观题分数 | 257 | item.subject = item.subject || 0; //主观题分数 |
| @@ -261,9 +267,6 @@ export default { | @@ -261,9 +267,6 @@ export default { | ||
| 261 | } else { | 267 | } else { |
| 262 | let num = Number(item.scoreMap[keys]); | 268 | let num = Number(item.scoreMap[keys]); |
| 263 | item.scoreMap[keys] = num; | 269 | item.scoreMap[keys] = num; |
| 264 | - if (num > 0) { | ||
| 265 | - item.isSetScore = false; | ||
| 266 | - } | ||
| 267 | } | 270 | } |
| 268 | }); | 271 | }); |
| 269 | 272 | ||
| @@ -291,7 +294,6 @@ export default { | @@ -291,7 +294,6 @@ export default { | ||
| 291 | scores: scoreMap, | 294 | scores: scoreMap, |
| 292 | }; | 295 | }; |
| 293 | }); | 296 | }); |
| 294 | - console.log(list); | ||
| 295 | const { data, status, info } = await this.$request.submitScore({ | 297 | const { data, status, info } = await this.$request.submitScore({ |
| 296 | examId: this.id, | 298 | examId: this.id, |
| 297 | list, | 299 | list, |
| @@ -341,7 +343,7 @@ export default { | @@ -341,7 +343,7 @@ export default { | ||
| 341 | width: calc(100% - 200px); | 343 | width: calc(100% - 200px); |
| 342 | height: calc(100% - 70px); | 344 | height: calc(100% - 70px); |
| 343 | background: #fff; | 345 | background: #fff; |
| 344 | - z-index: 2000; | 346 | + z-index: 200000; |
| 345 | overflow-y: auto; | 347 | overflow-y: auto; |
| 346 | } | 348 | } |
| 347 | 349 |
src/views/basic/test/components/test.vue
| @@ -435,9 +435,28 @@ | @@ -435,9 +435,28 @@ | ||
| 435 | !status && role != 'ROLE_BANZHUREN' && examReport.examPaperId != 0 | 435 | !status && role != 'ROLE_BANZHUREN' && examReport.examPaperId != 0 |
| 436 | " | 436 | " |
| 437 | > | 437 | > |
| 438 | - <el-button type="primary" round @click="openScoreSet" | 438 | + <el-button |
| 439 | + class="score-set" | ||
| 440 | + v-if="this.showSelect == false" | ||
| 441 | + type="primary" | ||
| 442 | + round | ||
| 443 | + @click="openScoreSet(2)" | ||
| 439 | >答卷录分</el-button | 444 | >答卷录分</el-button |
| 440 | > | 445 | > |
| 446 | + <el-popover v-else placement="bottom" width="194"> | ||
| 447 | + <div style="display: flex"> | ||
| 448 | + <el-button size="mini" @click="openScoreSet(1)" | ||
| 449 | + >录入总得分</el-button | ||
| 450 | + > | ||
| 451 | + <el-button type="primary" size="mini" @click="openScoreSet(2)" | ||
| 452 | + >录入小题分</el-button | ||
| 453 | + > | ||
| 454 | + </div> | ||
| 455 | + <el-button class="score-set" slot="reference" type="primary" round | ||
| 456 | + >答卷录分</el-button | ||
| 457 | + > | ||
| 458 | + </el-popover> | ||
| 459 | + | ||
| 441 | <template | 460 | <template |
| 442 | v-if="examReport.subjectiveScore != examReport.examPaperScore" | 461 | v-if="examReport.subjectiveScore != examReport.examPaperScore" |
| 443 | > | 462 | > |
| @@ -453,6 +472,8 @@ | @@ -453,6 +472,8 @@ | ||
| 453 | :id="id" | 472 | :id="id" |
| 454 | :title="title" | 473 | :title="title" |
| 455 | :examScore="score" | 474 | :examScore="score" |
| 475 | + :showAllSetScore="showAllSetScore" | ||
| 476 | + :showSetScore="showSetScore" | ||
| 456 | :diaScoreSet="diaScoreSet" | 477 | :diaScoreSet="diaScoreSet" |
| 457 | @closeScoreSet="closeScoreSet" | 478 | @closeScoreSet="closeScoreSet" |
| 458 | @SuccessScoreSet="SuccessScoreSet" | 479 | @SuccessScoreSet="SuccessScoreSet" |
| @@ -521,7 +542,7 @@ export default { | @@ -521,7 +542,7 @@ export default { | ||
| 521 | title: String, | 542 | title: String, |
| 522 | classIds: Array, | 543 | classIds: Array, |
| 523 | subjectName: String, | 544 | subjectName: String, |
| 524 | - examType: String, | 545 | + examType: Number, |
| 525 | score: { | 546 | score: { |
| 526 | type: Number, | 547 | type: Number, |
| 527 | default: 0, | 548 | default: 0, |
| @@ -581,6 +602,10 @@ export default { | @@ -581,6 +602,10 @@ export default { | ||
| 581 | //导出相关 | 602 | //导出相关 |
| 582 | diaShow: false, | 603 | diaShow: false, |
| 583 | exportStudent: [], | 604 | exportStudent: [], |
| 605 | + | ||
| 606 | + showSelect: true, //是否显示录总分 | ||
| 607 | + showAllSetScore: false, //当前操作试卷可录总分分状态 | ||
| 608 | + showSetScore: false, //当前操作试卷可录小题分状态 | ||
| 584 | }; | 609 | }; |
| 585 | }, | 610 | }, |
| 586 | created() { | 611 | created() { |
| @@ -596,8 +621,10 @@ export default { | @@ -596,8 +621,10 @@ export default { | ||
| 596 | } | 621 | } |
| 597 | }, | 622 | }, |
| 598 | //打开答卷录分 | 623 | //打开答卷录分 |
| 599 | - openScoreSet() { | 624 | + openScoreSet(type) { |
| 600 | this.diaScoreSet = true; | 625 | this.diaScoreSet = true; |
| 626 | + this.showAllSetScore = type == 1 ? true : false; | ||
| 627 | + this.showSetScore = type == 2 ? true : false; | ||
| 601 | }, | 628 | }, |
| 602 | //关闭设置分数 | 629 | //关闭设置分数 |
| 603 | closeScoreSet() { | 630 | closeScoreSet() { |
| @@ -750,6 +777,9 @@ export default { | @@ -750,6 +777,9 @@ export default { | ||
| 750 | let params = {}; | 777 | let params = {}; |
| 751 | 778 | ||
| 752 | const detail = JSON.parse(item.detail); | 779 | const detail = JSON.parse(item.detail); |
| 780 | + if (detail.length) { | ||
| 781 | + this.showSelect = false; | ||
| 782 | + } | ||
| 753 | if (detail.length > optionsList.length) { | 783 | if (detail.length > optionsList.length) { |
| 754 | optionsList = [...detail]; | 784 | optionsList = [...detail]; |
| 755 | } | 785 | } |
| @@ -768,7 +798,6 @@ export default { | @@ -768,7 +798,6 @@ export default { | ||
| 768 | ...params, | 798 | ...params, |
| 769 | }; | 799 | }; |
| 770 | }); | 800 | }); |
| 771 | - console.log(); | ||
| 772 | this.questionList = optionsList.sort((a, b) => { | 801 | this.questionList = optionsList.sort((a, b) => { |
| 773 | return a.id - b.id; | 802 | return a.id - b.id; |
| 774 | }); | 803 | }); |
| @@ -963,6 +992,9 @@ div::-webkit-scrollbar-thumb { | @@ -963,6 +992,9 @@ div::-webkit-scrollbar-thumb { | ||
| 963 | display: flex; | 992 | display: flex; |
| 964 | justify-content: space-between; | 993 | justify-content: space-between; |
| 965 | } | 994 | } |
| 995 | +.score-set { | ||
| 996 | + margin-right: 10px; | ||
| 997 | +} | ||
| 966 | 998 | ||
| 967 | .hui-box { | 999 | .hui-box { |
| 968 | display: flex; | 1000 | display: flex; |
src/views/basic/test/index.vue
| @@ -161,7 +161,6 @@ export default { | @@ -161,7 +161,6 @@ export default { | ||
| 161 | this.query.classId = val ? this.classList.map((item) => item.value) : []; | 161 | this.query.classId = val ? this.classList.map((item) => item.value) : []; |
| 162 | }, | 162 | }, |
| 163 | changeclass(value) { | 163 | changeclass(value) { |
| 164 | - console.log(value); | ||
| 165 | if (this.role == "ROLE_BANZHUREN") { | 164 | if (this.role == "ROLE_BANZHUREN") { |
| 166 | this._QuerySubjectList(); | 165 | this._QuerySubjectList(); |
| 167 | } else { | 166 | } else { |
| @@ -176,7 +175,6 @@ export default { | @@ -176,7 +175,6 @@ export default { | ||
| 176 | this.query.subjectNames = val ? this.subjectList : []; | 175 | this.query.subjectNames = val ? this.subjectList : []; |
| 177 | }, | 176 | }, |
| 178 | CheckedSub(value) { | 177 | CheckedSub(value) { |
| 179 | - console.log(value); | ||
| 180 | let checkedCount = value.length; | 178 | let checkedCount = value.length; |
| 181 | this.allSubject = checkedCount === this.subjectList.length; | 179 | this.allSubject = checkedCount === this.subjectList.length; |
| 182 | this.isIndeterminateSub = | 180 | this.isIndeterminateSub = |
src/views/basic/test/list.vue
| @@ -153,20 +153,45 @@ | @@ -153,20 +153,45 @@ | ||
| 153 | </el-tooltip> | 153 | </el-tooltip> |
| 154 | <template v-else>未设置答案</template> | 154 | <template v-else>未设置答案</template> |
| 155 | </template> | 155 | </template> |
| 156 | - <el-tooltip | 156 | + <template |
| 157 | v-if="role != 'ROLE_BANZHUREN' && scoped.row.examPaperId != 0" | 157 | v-if="role != 'ROLE_BANZHUREN' && scoped.row.examPaperId != 0" |
| 158 | - effect="dark" | ||
| 159 | - content="答卷录分" | ||
| 160 | - placement="top" | ||
| 161 | > | 158 | > |
| 162 | - <el-button | ||
| 163 | - type="primary" | ||
| 164 | - circle | ||
| 165 | - size="mini" | ||
| 166 | - @click="openScoreSet(scoped.row)" | ||
| 167 | - >分</el-button | ||
| 168 | - > | ||
| 169 | - </el-tooltip> | 159 | + <template> |
| 160 | + <el-popover placement="bottom" width="194"> | ||
| 161 | + <div | ||
| 162 | + style="display: flex" | ||
| 163 | + v-loading=" | ||
| 164 | + scoped.row.showSelect == 0 || | ||
| 165 | + scoped.row.showSelect == 1 | ||
| 166 | + ? false | ||
| 167 | + : true | ||
| 168 | + " | ||
| 169 | + > | ||
| 170 | + <el-button | ||
| 171 | + v-if="scoped.row.showSelect == 0" | ||
| 172 | + size="mini" | ||
| 173 | + @click="openScoreSet(scoped.row, 1)" | ||
| 174 | + >录入总得分</el-button | ||
| 175 | + > | ||
| 176 | + <el-button | ||
| 177 | + type="primary" | ||
| 178 | + size="mini" | ||
| 179 | + @click="openScoreSet(scoped.row, 2)" | ||
| 180 | + >录入小题分</el-button | ||
| 181 | + > | ||
| 182 | + </div> | ||
| 183 | + <el-button | ||
| 184 | + class="remove-test" | ||
| 185 | + slot="reference" | ||
| 186 | + type="primary" | ||
| 187 | + circle | ||
| 188 | + size="mini" | ||
| 189 | + @click="queryStatus(scoped.row)" | ||
| 190 | + >分</el-button | ||
| 191 | + > | ||
| 192 | + </el-popover> | ||
| 193 | + </template> | ||
| 194 | + </template> | ||
| 170 | <el-popconfirm | 195 | <el-popconfirm |
| 171 | v-if="role != 'ROLE_BANZHUREN'" | 196 | v-if="role != 'ROLE_BANZHUREN'" |
| 172 | title="确定删除吗?" | 197 | title="确定删除吗?" |
| @@ -205,6 +230,8 @@ | @@ -205,6 +230,8 @@ | ||
| 205 | :id="examId" | 230 | :id="examId" |
| 206 | :title="examTitlt" | 231 | :title="examTitlt" |
| 207 | :examScore="examScore" | 232 | :examScore="examScore" |
| 233 | + :showAllSetScore="showAllSetScore" | ||
| 234 | + :showSetScore="showSetScore" | ||
| 208 | @closeScoreSet="closeScoreSet" | 235 | @closeScoreSet="closeScoreSet" |
| 209 | @SuccessScoreSet="SuccessScoreSet" | 236 | @SuccessScoreSet="SuccessScoreSet" |
| 210 | /> | 237 | /> |
| @@ -231,6 +258,8 @@ export default { | @@ -231,6 +258,8 @@ export default { | ||
| 231 | examId: "", //当前操作试卷 | 258 | examId: "", //当前操作试卷 |
| 232 | examTitlt: "", //当前操作试卷名称 | 259 | examTitlt: "", //当前操作试卷名称 |
| 233 | examScore: 0, //当前操作试卷卷面总分 | 260 | examScore: 0, //当前操作试卷卷面总分 |
| 261 | + showAllSetScore: false, //当前操作试卷可录总分分状态 | ||
| 262 | + showSetScore: false, //当前操作试卷可录小题分状态 | ||
| 234 | query: { | 263 | query: { |
| 235 | //搜索条件 | 264 | //搜索条件 |
| 236 | classId: [], | 265 | classId: [], |
| @@ -283,7 +312,6 @@ export default { | @@ -283,7 +312,6 @@ export default { | ||
| 283 | queryData | 312 | queryData |
| 284 | ? (this.query = { ...this.query, ...JSON.parse(queryData) }) | 313 | ? (this.query = { ...this.query, ...JSON.parse(queryData) }) |
| 285 | : ""; | 314 | : ""; |
| 286 | - console.log(this.query); | ||
| 287 | this.$store.commit("setClasses", this.query.classId.join(",")); | 315 | this.$store.commit("setClasses", this.query.classId.join(",")); |
| 288 | this.isMultipleClass = false; | 316 | this.isMultipleClass = false; |
| 289 | this.role = | 317 | this.role = |
| @@ -314,7 +342,7 @@ export default { | @@ -314,7 +342,7 @@ export default { | ||
| 314 | score: obj.examPaperScore || 0, | 342 | score: obj.examPaperScore || 0, |
| 315 | type: 1, //试卷类型 | 343 | type: 1, //试卷类型 |
| 316 | subjectName: obj.subjectName, | 344 | subjectName: obj.subjectName, |
| 317 | - classIds: [obj.classId], | 345 | + classIds: obj.classId, |
| 318 | params: this.$route.query.params, | 346 | params: this.$route.query.params, |
| 319 | examType: obj.examPaperId == 0 ? 1 : 2, | 347 | examType: obj.examPaperId == 0 ? 1 : 2, |
| 320 | }, | 348 | }, |
| @@ -344,7 +372,6 @@ export default { | @@ -344,7 +372,6 @@ export default { | ||
| 344 | }); | 372 | }); |
| 345 | subjectArr = [...new Set(subjectArr)]; | 373 | subjectArr = [...new Set(subjectArr)]; |
| 346 | classIds = [...new Set(classIds)]; | 374 | classIds = [...new Set(classIds)]; |
| 347 | - console.log(subjectArr); | ||
| 348 | if (this.multipleSelection.length == 1) { | 375 | if (this.multipleSelection.length == 1) { |
| 349 | this.$router.push({ | 376 | this.$router.push({ |
| 350 | path: "/testAnalysis", | 377 | path: "/testAnalysis", |
| @@ -354,7 +381,7 @@ export default { | @@ -354,7 +381,7 @@ export default { | ||
| 354 | score: multipleData[0].examPaperScore || 0, | 381 | score: multipleData[0].examPaperScore || 0, |
| 355 | type: 1, | 382 | type: 1, |
| 356 | subjectName: subjectArr.join(), | 383 | subjectName: subjectArr.join(), |
| 357 | - classIds: classIds, | 384 | + classIds: classIds.join(), |
| 358 | params: this.$route.query.params, | 385 | params: this.$route.query.params, |
| 359 | }, | 386 | }, |
| 360 | }); | 387 | }); |
| @@ -364,7 +391,7 @@ export default { | @@ -364,7 +391,7 @@ export default { | ||
| 364 | path: "/testAnalysis", | 391 | path: "/testAnalysis", |
| 365 | query: { | 392 | query: { |
| 366 | ids: this.multipleSelection.join(), | 393 | ids: this.multipleSelection.join(), |
| 367 | - classIds: classIds, | 394 | + classIds: classIds.join(), |
| 368 | type: subjectArr.length == 1 ? 2 : 3, | 395 | type: subjectArr.length == 1 ? 2 : 3, |
| 369 | subjectName: subjectArr.join(), | 396 | subjectName: subjectArr.join(), |
| 370 | params: this.$route.query.params, | 397 | params: this.$route.query.params, |
| @@ -374,7 +401,6 @@ export default { | @@ -374,7 +401,6 @@ export default { | ||
| 374 | }, | 401 | }, |
| 375 | // 多班对比 | 402 | // 多班对比 |
| 376 | linkContrast(obj) { | 403 | linkContrast(obj) { |
| 377 | - console.log(obj); | ||
| 378 | this.$router.push({ | 404 | this.$router.push({ |
| 379 | path: "/testAnalysis", | 405 | path: "/testAnalysis", |
| 380 | query: { | 406 | query: { |
| @@ -412,9 +438,24 @@ export default { | @@ -412,9 +438,24 @@ export default { | ||
| 412 | handleSelectionChange(val) { | 438 | handleSelectionChange(val) { |
| 413 | this.multipleSelection = val; | 439 | this.multipleSelection = val; |
| 414 | }, | 440 | }, |
| 441 | + //已录分状态 | ||
| 442 | + async queryStatus(obj) { | ||
| 443 | + const { data, status, info } = await this.$request.getScoreType({ | ||
| 444 | + examId: obj.id, | ||
| 445 | + }); | ||
| 446 | + if (status === 0) { | ||
| 447 | + // if (data == 1) { | ||
| 448 | + // this.openScoreSet(obj, 2); | ||
| 449 | + // } | ||
| 450 | + obj.showSelect = data; | ||
| 451 | + } else { | ||
| 452 | + this.$message.error(info); | ||
| 453 | + } | ||
| 454 | + }, | ||
| 415 | //打开答卷录分 | 455 | //打开答卷录分 |
| 416 | - openScoreSet(obj) { | ||
| 417 | - console.log(obj); | 456 | + openScoreSet(obj, type) { |
| 457 | + this.showAllSetScore = type == 1 ? true : false; | ||
| 458 | + this.showSetScore = type == 2 ? true : false; | ||
| 418 | this.examId = String(obj.id); | 459 | this.examId = String(obj.id); |
| 419 | this.examTitlt = obj.title; | 460 | this.examTitlt = obj.title; |
| 420 | this.examScore = obj.examPaperScore; | 461 | this.examScore = obj.examPaperScore; |
| @@ -505,7 +546,11 @@ export default { | @@ -505,7 +546,11 @@ export default { | ||
| 505 | if (status === 0) { | 546 | if (status === 0) { |
| 506 | if (this.role == "ROLE_BANZHUREN") { | 547 | if (this.role == "ROLE_BANZHUREN") { |
| 507 | this.isMultipleClass = false; | 548 | this.isMultipleClass = false; |
| 508 | - this.tableData = (data?.list && [...data?.list]) || []; | 549 | + this.tableData = |
| 550 | + data?.list?.map((item) => { | ||
| 551 | + item.showSelect = false; | ||
| 552 | + return item; | ||
| 553 | + }) || []; | ||
| 509 | this.total = data?.count || 0; | 554 | this.total = data?.count || 0; |
| 510 | } else { | 555 | } else { |
| 511 | if (this.query.classId.length > 1) { | 556 | if (this.query.classId.length > 1) { |
| @@ -554,7 +599,11 @@ export default { | @@ -554,7 +599,11 @@ export default { | ||
| 554 | }); | 599 | }); |
| 555 | } else { | 600 | } else { |
| 556 | this.isMultipleClass = false; | 601 | this.isMultipleClass = false; |
| 557 | - this.tableData = (data?.list && [...data?.list]) || []; | 602 | + this.tableData = |
| 603 | + data?.list?.map((item) => { | ||
| 604 | + item.showSelect = false; | ||
| 605 | + return item; | ||
| 606 | + }) || []; | ||
| 558 | this.total = data?.count || 0; | 607 | this.total = data?.count || 0; |
| 559 | } | 608 | } |
| 560 | } | 609 | } |
src/views/basic/userInfo/index.vue
| @@ -214,7 +214,7 @@ export default { | @@ -214,7 +214,7 @@ export default { | ||
| 214 | this.loading = true; | 214 | this.loading = true; |
| 215 | const { data, status, info } = await this.$request.getInfo(); | 215 | const { data, status, info } = await this.$request.getInfo(); |
| 216 | this.loading = false; | 216 | this.loading = false; |
| 217 | - console.log(status); | 217 | + |
| 218 | if (status === 0) { | 218 | if (status === 0) { |
| 219 | this.Info = { ...data }; | 219 | this.Info = { ...data }; |
| 220 | for (let key in this.formSchool) { | 220 | for (let key in this.formSchool) { |
src/views/examinationPaper/add.vue
| @@ -1721,7 +1721,6 @@ export default { | @@ -1721,7 +1721,6 @@ export default { | ||
| 1721 | } | 1721 | } |
| 1722 | } | 1722 | } |
| 1723 | } | 1723 | } |
| 1724 | - console.log(this.form.questionList[0].subQuestions); | ||
| 1725 | }, | 1724 | }, |
| 1726 | openQuestion() { | 1725 | openQuestion() { |
| 1727 | this.questionForm = { ...questionForm }; | 1726 | this.questionForm = { ...questionForm }; |
| @@ -2044,7 +2043,6 @@ export default { | @@ -2044,7 +2043,6 @@ export default { | ||
| 2044 | const { data, status, info } = await fetchClassList(); | 2043 | const { data, status, info } = await fetchClassList(); |
| 2045 | if (status == 0) { | 2044 | if (status == 0) { |
| 2046 | this.gradeClassList = data.list?.map((item) => { | 2045 | this.gradeClassList = data.list?.map((item) => { |
| 2047 | - console.log(!this.gradeList.includes(item.gradeName)); | ||
| 2048 | if (!this.gradeList.includes(item.gradeName)) { | 2046 | if (!this.gradeList.includes(item.gradeName)) { |
| 2049 | this.gradeList.push(item.gradeName); | 2047 | this.gradeList.push(item.gradeName); |
| 2050 | } | 2048 | } |
src/views/examinationPaper/addQs.vue
| @@ -794,7 +794,6 @@ export default { | @@ -794,7 +794,6 @@ export default { | ||
| 794 | this.form.sharingType = params?.sharingType || 0; | 794 | this.form.sharingType = params?.sharingType || 0; |
| 795 | this.formatData(params); | 795 | this.formatData(params); |
| 796 | } | 796 | } |
| 797 | - console.log(this.form); | ||
| 798 | if (this.role != "ROLE_PERSONAL") { | 797 | if (this.role != "ROLE_PERSONAL") { |
| 799 | this.formRules.gradeName = [ | 798 | this.formRules.gradeName = [ |
| 800 | { required: true, message: "请选择年级", trigger: "blur" }, | 799 | { required: true, message: "请选择年级", trigger: "blur" }, |
| @@ -1383,7 +1382,6 @@ export default { | @@ -1383,7 +1382,6 @@ export default { | ||
| 1383 | const { data, status, info } = await fetchClassList(); | 1382 | const { data, status, info } = await fetchClassList(); |
| 1384 | if (status == 0) { | 1383 | if (status == 0) { |
| 1385 | this.gradeClassList = data.list?.map((item) => { | 1384 | this.gradeClassList = data.list?.map((item) => { |
| 1386 | - console.log(!this.gradeList.includes(item.gradeName)); | ||
| 1387 | if (!this.gradeList.includes(item.gradeName)) { | 1385 | if (!this.gradeList.includes(item.gradeName)) { |
| 1388 | this.gradeList.push(item.gradeName); | 1386 | this.gradeList.push(item.gradeName); |
| 1389 | } | 1387 | } |
src/views/examinationPaper/edit.vue
| @@ -563,8 +563,6 @@ export default { | @@ -563,8 +563,6 @@ export default { | ||
| 563 | sectionName = item.sectionName; | 563 | sectionName = item.sectionName; |
| 564 | } | 564 | } |
| 565 | }); | 565 | }); |
| 566 | - console.log(this.gradeClassList); | ||
| 567 | - console.log(sectionName); | ||
| 568 | if ( | 566 | if ( |
| 569 | sectionName && | 567 | sectionName && |
| 570 | Object.keys(this.knowledgeList).includes(sectionName) | 568 | Object.keys(this.knowledgeList).includes(sectionName) |
| @@ -1162,7 +1160,6 @@ export default { | @@ -1162,7 +1160,6 @@ export default { | ||
| 1162 | } | 1160 | } |
| 1163 | return sub; | 1161 | return sub; |
| 1164 | }); | 1162 | }); |
| 1165 | - console.log(types); | ||
| 1166 | for (let i = 0; i < types.length; i++) { | 1163 | for (let i = 0; i < types.length; i++) { |
| 1167 | if (types[i].qusType == 3) { | 1164 | if (types[i].qusType == 3) { |
| 1168 | types[i].answerList = types[i].answerList.slice(0, -1); | 1165 | types[i].answerList = types[i].answerList.slice(0, -1); |
| @@ -1176,7 +1173,6 @@ export default { | @@ -1176,7 +1173,6 @@ export default { | ||
| 1176 | } | 1173 | } |
| 1177 | } | 1174 | } |
| 1178 | } | 1175 | } |
| 1179 | - console.log(this.questionList); | ||
| 1180 | }, | 1176 | }, |
| 1181 | }, | 1177 | }, |
| 1182 | }; | 1178 | }; |
src/views/personal/dataSync/index.vue
| @@ -78,7 +78,6 @@ export default { | @@ -78,7 +78,6 @@ export default { | ||
| 78 | this.downLoading = true; | 78 | this.downLoading = true; |
| 79 | const data = await this.$request.pExportData(); | 79 | const data = await this.$request.pExportData(); |
| 80 | this.downLoading = false; | 80 | this.downLoading = false; |
| 81 | - console.log(data); | ||
| 82 | if (data) { | 81 | if (data) { |
| 83 | let blob = new Blob([data], { type: "application/octet-stream" }); | 82 | let blob = new Blob([data], { type: "application/octet-stream" }); |
| 84 | const url = URL.createObjectURL(blob); | 83 | const url = URL.createObjectURL(blob); |
src/views/personal/setUp/student.vue
| @@ -395,7 +395,6 @@ export default { | @@ -395,7 +395,6 @@ export default { | ||
| 395 | let hasName = this.studentList.find((item) => { | 395 | let hasName = this.studentList.find((item) => { |
| 396 | return item.studentName == this.formStu.studentName; | 396 | return item.studentName == this.formStu.studentName; |
| 397 | }); | 397 | }); |
| 398 | - console.log(hasName); | ||
| 399 | if (hasName) { | 398 | if (hasName) { |
| 400 | this.$message.warning("学生姓名已存在"); | 399 | this.$message.warning("学生姓名已存在"); |
| 401 | return; | 400 | return; |
| @@ -405,7 +404,7 @@ export default { | @@ -405,7 +404,7 @@ export default { | ||
| 405 | ...query, | 404 | ...query, |
| 406 | }); | 405 | }); |
| 407 | this.loading = false; | 406 | this.loading = false; |
| 408 | - console.log(status); | 407 | + |
| 409 | if (status === 0) { | 408 | if (status === 0) { |
| 410 | this.$message.success(info); | 409 | this.$message.success(info); |
| 411 | this.diaStu = false; | 410 | this.diaStu = false; |
| @@ -425,7 +424,7 @@ export default { | @@ -425,7 +424,7 @@ export default { | ||
| 425 | ...this.query, | 424 | ...this.query, |
| 426 | }); | 425 | }); |
| 427 | this.loading = false; | 426 | this.loading = false; |
| 428 | - console.log(status); | 427 | + |
| 429 | if (status === 0) { | 428 | if (status === 0) { |
| 430 | this.studentList = data.list || []; | 429 | this.studentList = data.list || []; |
| 431 | } else { | 430 | } else { |
src/views/personal/test/analysis.vue
| @@ -487,7 +487,6 @@ export default { | @@ -487,7 +487,6 @@ export default { | ||
| 487 | this._QueryData(); | 487 | this._QueryData(); |
| 488 | }, | 488 | }, |
| 489 | setType(type) { | 489 | setType(type) { |
| 490 | - console.log(this.$refs.main.offsetHeight - 50); | ||
| 491 | this.tableMaxHeight = this.$refs.main.offsetHeight; | 490 | this.tableMaxHeight = this.$refs.main.offsetHeight; |
| 492 | this.type = type; | 491 | this.type = type; |
| 493 | }, | 492 | }, |
| @@ -604,7 +603,6 @@ export default { | @@ -604,7 +603,6 @@ export default { | ||
| 604 | ...params, | 603 | ...params, |
| 605 | }; | 604 | }; |
| 606 | }); | 605 | }); |
| 607 | - console.log(); | ||
| 608 | this.questionList = optionsList.sort((a, b) => { | 606 | this.questionList = optionsList.sort((a, b) => { |
| 609 | return a.id - b.id; | 607 | return a.id - b.id; |
| 610 | }); | 608 | }); |
src/views/personal/test/archiving.vue
| @@ -417,7 +417,6 @@ export default { | @@ -417,7 +417,6 @@ export default { | ||
| 417 | let leng = val.length - 1; | 417 | let leng = val.length - 1; |
| 418 | sub = val[leng]; | 418 | sub = val[leng]; |
| 419 | } | 419 | } |
| 420 | - console.log(val); | ||
| 421 | this.query.subjectNames = val.filter((item) => { | 420 | this.query.subjectNames = val.filter((item) => { |
| 422 | return sub != "全部" ? item != "全部" : item == "全部"; | 421 | return sub != "全部" ? item != "全部" : item == "全部"; |
| 423 | }); | 422 | }); |
src/views/personal/test/index.vue
| @@ -515,7 +515,6 @@ export default { | @@ -515,7 +515,6 @@ export default { | ||
| 515 | let leng = val.length - 1; | 515 | let leng = val.length - 1; |
| 516 | sub = val[leng]; | 516 | sub = val[leng]; |
| 517 | } | 517 | } |
| 518 | - console.log(val); | ||
| 519 | this.query.subjectNames = val.filter((item) => { | 518 | this.query.subjectNames = val.filter((item) => { |
| 520 | return sub != "全部" ? item != "全部" : item == "全部"; | 519 | return sub != "全部" ? item != "全部" : item == "全部"; |
| 521 | }); | 520 | }); |
src/views/personal/userInfo/index.vue
| @@ -214,7 +214,7 @@ export default { | @@ -214,7 +214,7 @@ export default { | ||
| 214 | this.loading = true; | 214 | this.loading = true; |
| 215 | const { data, status, info } = await this.$request.getInfo(); | 215 | const { data, status, info } = await this.$request.getInfo(); |
| 216 | this.loading = false; | 216 | this.loading = false; |
| 217 | - console.log(status); | 217 | + |
| 218 | if (status === 0) { | 218 | if (status === 0) { |
| 219 | this.Info = { ...data }; | 219 | this.Info = { ...data }; |
| 220 | for (let key in this.formSchool) { | 220 | for (let key in this.formSchool) { |