diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 67c7e0d..6b0e283 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -885,4 +885,8 @@ export default { deviceZipLogList(data) { return defaltService(setUpUrls.deviceZipLogList, data) }, + // 获取即时测报表录分情况 + getScoreType(data) { + return defaltService(setUpUrls.getScoreType, data) + }, }; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index a3d9bc4..223fc3a 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -446,4 +446,8 @@ export default { deviceZipLogList: "/api_html/school/manager/deviceZipLogList", + //获取即时测报表录分情况 + getScoreType: "/api_html/teaching/getScoreType", + + } diff --git a/src/components/backBox.vue b/src/components/backBox.vue index 1e6ce9e..4c427de 100644 --- a/src/components/backBox.vue +++ b/src/components/backBox.vue @@ -27,7 +27,6 @@ export default { }, methods: { back() { - console.log(this.toHome) if (this.toHome) { this.$router.push({ path: "/index", diff --git a/src/views/basic/analysis/index.vue b/src/views/basic/analysis/index.vue index 0ab8b3e..858de53 100644 --- a/src/views/basic/analysis/index.vue +++ b/src/views/basic/analysis/index.vue @@ -174,7 +174,6 @@ export default { (this.props.lazyLoad = function (node, resolve) { const { level } = node; if (level == 3) { - console.log(node); that.$request .tenantSubjectList({ schoolId: node.path[0], @@ -246,7 +245,6 @@ export default { })[0]; }, secGraClaSubChange(event, index) { - console.log(event); let txt = ""; let xx = this.filterObj(this.gradeList, event[0]); txt += xx.label; diff --git a/src/views/basic/analysis/indexOld.vue b/src/views/basic/analysis/indexOld.vue index cb85746..7686a75 100644 --- a/src/views/basic/analysis/indexOld.vue +++ b/src/views/basic/analysis/indexOld.vue @@ -351,7 +351,6 @@ export default { } }); }); - console.log(dataList); this.tableData = data.map((item) => { let params = {}; dataIdsList.map((ids, index) => { diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index 7131654..4ca9ede 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -137,7 +137,6 @@ export default { // this.className = this.$route.query.className; const queryData = JSON.parse(this.$route.query.params); this.classIds = this.$route.query.classIds; - console.log(this.$route.query); this.subjectNames = this.$route.query.subjectNames.split(","); if (this.types == 1) { this.tabList = [ @@ -315,7 +314,6 @@ export default { ...query, }); this.loading = false; - console.log(data); if (status === 0) { this.exportStudent = (data?.list && [...data?.list]) || []; } else { diff --git a/src/views/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue index e9d28b4..b853bbb 100644 --- a/src/views/basic/ask/archiving.vue +++ b/src/views/basic/ask/archiving.vue @@ -541,7 +541,6 @@ export default { let leng = val.length - 1; sub = val[leng]; } - console.log(val); this.query.subjectNames = val.filter((item) => { return sub != "全部" ? item != "全部" : item == "全部"; }); diff --git a/src/views/basic/ask/index.vue b/src/views/basic/ask/index.vue index 40f1f76..c1c9eac 100644 --- a/src/views/basic/ask/index.vue +++ b/src/views/basic/ask/index.vue @@ -153,7 +153,6 @@ export default { this.query.subjectNames = val ? this.subjectList : []; }, handleChecked(value) { - console.log(value); let checkedCount = value.length; this.allSubject = checkedCount === this.subjectList.length; this.isIndeterminate = diff --git a/src/views/basic/card/index.vue b/src/views/basic/card/index.vue index d1b5553..31a7efe 100644 --- a/src/views/basic/card/index.vue +++ b/src/views/basic/card/index.vue @@ -177,7 +177,6 @@ export default { async _QueryGradeList() { this.loading = true; const { data, status, info } = await this.$request.gradeList(); - console.log(status); if (status === 0) { if (!!data.list) { this.gradeList = @@ -272,7 +271,6 @@ export default { size: 20, }); this.loading = false; - console.log(status); if (status === 0) { this.tableData = data.list || []; this.total = data.count; diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue index d8f34b4..45fe59d 100644 --- a/src/views/basic/dataSync/index.vue +++ b/src/views/basic/dataSync/index.vue @@ -98,7 +98,6 @@ export default { query.exportData = formatDate(times, "yyyy-MM-dd"); query.exportData = query.exportData.replaceAll("-", "") } - console.log({ ...query }) const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData const data = await exportData({ ...query }); this.downLoading = false; diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue index ee60133..fdd99fd 100644 --- a/src/views/basic/device/index.vue +++ b/src/views/basic/device/index.vue @@ -899,7 +899,6 @@ export default { this._QueryData(false); }, handleSelectionChange(val) { - console.log(val); this.selectionTabIds = val.map((item) => { return item.id; }); @@ -908,7 +907,6 @@ export default { this._ModifyUpgradeFlagBySchool(); }, 800), changeUpdate: _.debounce(function (event, obj) { - console.log(this); if (event) { this.autoUpDate(obj.id); } else { @@ -1115,7 +1113,6 @@ export default { ...query, }); this.loadingAnswerEqu = false; - console.log(status); if (status === 0) { this.diaAnswerEqu = false; this.$message.success(info); diff --git a/src/views/basic/down/client.vue b/src/views/basic/down/client.vue index 4077096..a0523f6 100644 --- a/src/views/basic/down/client.vue +++ b/src/views/basic/down/client.vue @@ -407,7 +407,6 @@ export default { methods: { setConfigForm(obj) { let content = JSON.parse(obj.content); - console.log(content); this.formData.configName = obj.configName; for (let key in this.formData) { content[key] ? (this.formData[key] = content[key]) : ""; diff --git a/src/views/basic/setUp/PersonalStudent.vue b/src/views/basic/setUp/PersonalStudent.vue index 4680e2a..6cf3322 100644 --- a/src/views/basic/setUp/PersonalStudent.vue +++ b/src/views/basic/setUp/PersonalStudent.vue @@ -395,7 +395,6 @@ export default { let hasName = this.studentList.find((item) => { return item.studentName == this.formStu.studentName; }); - console.log(hasName); if (hasName) { this.$message.warning("学生姓名已存在"); return; @@ -405,7 +404,6 @@ export default { ...query, }); this.loading = false; - console.log(status); if (status === 0) { this.$message.success(info); this.diaStu = false; @@ -425,7 +423,7 @@ export default { ...this.query, }); this.loading = false; - console.log(status); + if (status === 0) { this.studentList = data.list || []; } else { diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue index 9e64b3f..aadc9d5 100644 --- a/src/views/basic/setUp/account.vue +++ b/src/views/basic/setUp/account.vue @@ -536,7 +536,6 @@ export default { this.diaCount = true; }, handleDropdownClick(value, item) { - console.log(item); //更多 if (value == 2) { this.$confirm("确定要删除这条账号信息吗？", "提示", { @@ -605,7 +604,6 @@ export default { }, async updateUser(obj, type) { let query = {}; - console.log(query); if (type == 1) { query.available = obj.available == 0 ? 1 : 0; } diff --git a/src/views/basic/setUp/conglomerate.vue b/src/views/basic/setUp/conglomerate.vue index cae63c6..236655c 100644 --- a/src/views/basic/setUp/conglomerate.vue +++ b/src/views/basic/setUp/conglomerate.vue @@ -372,7 +372,6 @@ export default { async _QuerySectionList() { //学校学段 const { data, status, info } = await this.$request.sectionList(); - console.log(status); if (status === 0) { this.sectionsList = data?.list || []; } else { diff --git a/src/views/basic/setUp/school.vue b/src/views/basic/setUp/school.vue index 5bb5742..d5270b9 100644 --- a/src/views/basic/setUp/school.vue +++ b/src/views/basic/setUp/school.vue @@ -277,7 +277,7 @@ export default { async _QuerySectionList() { //学校学段 const { data, status, info } = await this.$request.sectionList(); - console.log(status); + if (status === 0) { this.sectionsList = data?.list || []; } else { @@ -294,7 +294,6 @@ export default { for (let key in this.formSchool) { if (key == "sections") { this.formSchool.sections = data[key].split(",").map((item) => { - console.log(Number(item)); return Number(item); }); } else { @@ -310,7 +309,7 @@ export default { this.loading = true; const { data, status, info } = await this.$request.gradeList(); this.loading = false; - console.log(status); + if (status === 0) { this.tableData = data.list || []; } else { diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue index 4945c48..8d73f30 100644 --- a/src/views/basic/setUp/student.vue +++ b/src/views/basic/setUp/student.vue @@ -540,7 +540,6 @@ export default { let hasName = this.studentList.find((item) => { return item.studentName == this.formStu.studentName; }); - console.log(hasName); if (hasName) { this.$message.warning("学生姓名已存在"); this.loading = false; @@ -551,7 +550,7 @@ export default { ...query, }); this.loading = false; - console.log(status); + if (status === 0) { this.$message.success(info); this.diaStu = false; @@ -573,7 +572,6 @@ export default { }, //学生调班弹窗 openChangeClazz(obj) { - console.log(obj); this.formStuCla.classId = ""; this.formStuCla.studentId = obj.id; this.formStuCla.classList = obj.classList || []; @@ -723,7 +721,7 @@ export default { ...query, }); this.loading = false; - console.log(status); + if (status === 0) { this.studentList = (data.list && [...data?.list]) || []; } else { @@ -768,7 +766,6 @@ export default { let classType = ""; this.formStuCla.classList.map((item) => { if (this.formStuCla.oldClassId == item.id) { - console.log(item); classType = item.classType; grade = item.grade; } diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue index fbe582a..ea62862 100644 --- a/src/views/basic/setUp/teacher.vue +++ b/src/views/basic/setUp/teacher.vue @@ -722,7 +722,6 @@ export default { this.$message.error(res.info); } } else { - console.log(valid); this.$message.warning("输入有误请检查！"); return false; } @@ -973,7 +972,7 @@ export default { ...query, }); this.loading = false; - console.log(status); + if (status === 0) { this.teacherList = data.list || []; if (type == 10) { diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue index 723f0c2..d1d1e06 100644 --- a/src/views/basic/test/analysis.vue +++ b/src/views/basic/test/analysis.vue @@ -77,15 +77,15 @@ export default { this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; this.id = this.$route.query.id || ""; - this.examType = this.$route.query.examType || 2; + this.examType = Number(this.$route.query.examType || 2); this.score = Number(this.$route.query.score) || 0; this.ids = (this.$route.query.ids && this.$route.query.ids.split(",")) || []; this.type = this.$route.query.type; - this.classIds = this.$route.query.classIds || []; + this.classIds = this.$route.query.classIds?.split(",") || []; + console.log(this.classIds); this.title = this.$route.query.title || ""; this.subjectName = this.$route.query.subjectName || ""; - console.log(this.classIds) }, methods: {}, }; diff --git a/src/views/basic/test/archiving.vue b/src/views/basic/test/archiving.vue index 4dd9d93..051de0b 100644 --- a/src/views/basic/test/archiving.vue +++ b/src/views/basic/test/archiving.vue @@ -471,7 +471,6 @@ export default { let leng = val.length - 1; sub = val[leng]; } - console.log(val); this.query.subjectNames = val.filter((item) => { return sub != "全部" ? item != "全部" : item == "全部"; }); @@ -487,7 +486,7 @@ export default { status: 1, type: 1, //试卷类型 subjectName: obj.subjectName, - classIds: [obj.classId], + classIds: obj.classId, params: JSON.stringify({ ...this.query, subjectNames: [this.query.subjectNames], @@ -755,7 +754,6 @@ export default { } }); }); - console.log(dataList); this.tableData = data?.list.map((item) => { let params = {}; dataIdsList.map((ids, index) => { diff --git a/src/views/basic/test/components/contrast.vue b/src/views/basic/test/components/contrast.vue index 5b6a983..fbbe756 100644 --- a/src/views/basic/test/components/contrast.vue +++ b/src/views/basic/test/components/contrast.vue @@ -183,7 +183,6 @@ export default { ); }, setType(type) { - console.log(this.$refs.main.offsetHeight - 50); this.tableMaxHeight = this.$refs.main.offsetHeight; this.type = type; }, diff --git a/src/views/basic/test/components/scoreSet.vue b/src/views/basic/test/components/scoreSet.vue index e550ae6..e27f399 100644 --- a/src/views/basic/test/components/scoreSet.vue +++ b/src/views/basic/test/components/scoreSet.vue @@ -43,7 +43,7 @@ @@ -231,6 +258,8 @@ export default { examId: "", //当前操作试卷 examTitlt: "", //当前操作试卷名称 examScore: 0, //当前操作试卷卷面总分 + showAllSetScore: false, //当前操作试卷可录总分分状态 + showSetScore: false, //当前操作试卷可录小题分状态 query: { //搜索条件 classId: [], @@ -283,7 +312,6 @@ export default { queryData ? (this.query = { ...this.query, ...JSON.parse(queryData) }) : ""; - console.log(this.query); this.$store.commit("setClasses", this.query.classId.join(",")); this.isMultipleClass = false; this.role = @@ -314,7 +342,7 @@ export default { score: obj.examPaperScore || 0, type: 1, //试卷类型 subjectName: obj.subjectName, - classIds: [obj.classId], + classIds: obj.classId, params: this.$route.query.params, examType: obj.examPaperId == 0 ? 1 : 2, }, @@ -344,7 +372,6 @@ export default { }); subjectArr = [...new Set(subjectArr)]; classIds = [...new Set(classIds)]; - console.log(subjectArr); if (this.multipleSelection.length == 1) { this.$router.push({ path: "/testAnalysis", @@ -354,7 +381,7 @@ export default { score: multipleData[0].examPaperScore || 0, type: 1, subjectName: subjectArr.join(), - classIds: classIds, + classIds: classIds.join(), params: this.$route.query.params, }, }); @@ -364,7 +391,7 @@ export default { path: "/testAnalysis", query: { ids: this.multipleSelection.join(), - classIds: classIds, + classIds: classIds.join(), type: subjectArr.length == 1 ? 2 : 3, subjectName: subjectArr.join(), params: this.$route.query.params, @@ -374,7 +401,6 @@ export default { }, // 多班对比 linkContrast(obj) { - console.log(obj); this.$router.push({ path: "/testAnalysis", query: { @@ -412,9 +438,24 @@ export default { handleSelectionChange(val) { this.multipleSelection = val; }, + //已录分状态 + async queryStatus(obj) { + const { data, status, info } = await this.$request.getScoreType({ + examId: obj.id, + }); + if (status === 0) { + // if (data == 1) { + // this.openScoreSet(obj, 2); + // } + obj.showSelect = data; + } else { + this.$message.error(info); + } + }, //打开答卷录分 - openScoreSet(obj) { - console.log(obj); + openScoreSet(obj, type) { + this.showAllSetScore = type == 1 ? true : false; + this.showSetScore = type == 2 ? true : false; this.examId = String(obj.id); this.examTitlt = obj.title; this.examScore = obj.examPaperScore; @@ -505,7 +546,11 @@ export default { if (status === 0) { if (this.role == "ROLE_BANZHUREN") { this.isMultipleClass = false; - this.tableData = (data?.list && [...data?.list]) || []; + this.tableData = + data?.list?.map((item) => { + item.showSelect = false; + return item; + }) || []; this.total = data?.count || 0; } else { if (this.query.classId.length > 1) { @@ -554,7 +599,11 @@ export default { }); } else { this.isMultipleClass = false; - this.tableData = (data?.list && [...data?.list]) || []; + this.tableData = + data?.list?.map((item) => { + item.showSelect = false; + return item; + }) || []; this.total = data?.count || 0; } } diff --git a/src/views/basic/userInfo/index.vue b/src/views/basic/userInfo/index.vue index ff3de4d..67df56d 100644 --- a/src/views/basic/userInfo/index.vue +++ b/src/views/basic/userInfo/index.vue @@ -214,7 +214,7 @@ export default { this.loading = true; const { data, status, info } = await this.$request.getInfo(); this.loading = false; - console.log(status); + if (status === 0) { this.Info = { ...data }; for (let key in this.formSchool) { diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue index 3c47e27..eeed57e 100644 --- a/src/views/examinationPaper/add.vue +++ b/src/views/examinationPaper/add.vue @@ -1721,7 +1721,6 @@ export default { } } } - console.log(this.form.questionList[0].subQuestions); }, openQuestion() { this.questionForm = { ...questionForm }; @@ -2044,7 +2043,6 @@ export default { const { data, status, info } = await fetchClassList(); if (status == 0) { this.gradeClassList = data.list?.map((item) => { - console.log(!this.gradeList.includes(item.gradeName)); if (!this.gradeList.includes(item.gradeName)) { this.gradeList.push(item.gradeName); } diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue index a669ac1..8438e3f 100644 --- a/src/views/examinationPaper/addQs.vue +++ b/src/views/examinationPaper/addQs.vue @@ -794,7 +794,6 @@ export default { this.form.sharingType = params?.sharingType || 0; this.formatData(params); } - console.log(this.form); if (this.role != "ROLE_PERSONAL") { this.formRules.gradeName = [ { required: true, message: "请选择年级", trigger: "blur" }, @@ -1383,7 +1382,6 @@ export default { const { data, status, info } = await fetchClassList(); if (status == 0) { this.gradeClassList = data.list?.map((item) => { - console.log(!this.gradeList.includes(item.gradeName)); if (!this.gradeList.includes(item.gradeName)) { this.gradeList.push(item.gradeName); } diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue index 2f9bad9..831d05b 100644 --- a/src/views/examinationPaper/edit.vue +++ b/src/views/examinationPaper/edit.vue @@ -563,8 +563,6 @@ export default { sectionName = item.sectionName; } }); - console.log(this.gradeClassList); - console.log(sectionName); if ( sectionName && Object.keys(this.knowledgeList).includes(sectionName) @@ -1162,7 +1160,6 @@ export default { } return sub; }); - console.log(types); for (let i = 0; i < types.length; i++) { if (types[i].qusType == 3) { types[i].answerList = types[i].answerList.slice(0, -1); @@ -1176,7 +1173,6 @@ export default { } } } - console.log(this.questionList); }, }, }; diff --git a/src/views/personal/dataSync/index.vue b/src/views/personal/dataSync/index.vue index f854cae..04e6772 100644 --- a/src/views/personal/dataSync/index.vue +++ b/src/views/personal/dataSync/index.vue @@ -78,7 +78,6 @@ export default { this.downLoading = true; const data = await this.$request.pExportData(); this.downLoading = false; - console.log(data); if (data) { let blob = new Blob([data], { type: "application/octet-stream" }); const url = URL.createObjectURL(blob); diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue index 4680e2a..ea63aa1 100644 --- a/src/views/personal/setUp/student.vue +++ b/src/views/personal/setUp/student.vue @@ -395,7 +395,6 @@ export default { let hasName = this.studentList.find((item) => { return item.studentName == this.formStu.studentName; }); - console.log(hasName); if (hasName) { this.$message.warning("学生姓名已存在"); return; @@ -405,7 +404,7 @@ export default { ...query, }); this.loading = false; - console.log(status); + if (status === 0) { this.$message.success(info); this.diaStu = false; @@ -425,7 +424,7 @@ export default { ...this.query, }); this.loading = false; - console.log(status); + if (status === 0) { this.studentList = data.list || []; } else { diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue index fa4c492..6faf665 100644 --- a/src/views/personal/test/analysis.vue +++ b/src/views/personal/test/analysis.vue @@ -487,7 +487,6 @@ export default { this._QueryData(); }, setType(type) { - console.log(this.$refs.main.offsetHeight - 50); this.tableMaxHeight = this.$refs.main.offsetHeight; this.type = type; }, @@ -604,7 +603,6 @@ export default { ...params, }; }); - console.log(); this.questionList = optionsList.sort((a, b) => { return a.id - b.id; }); diff --git a/src/views/personal/test/archiving.vue b/src/views/personal/test/archiving.vue index ee1cf87..b6b8bdc 100644 --- a/src/views/personal/test/archiving.vue +++ b/src/views/personal/test/archiving.vue @@ -417,7 +417,6 @@ export default { let leng = val.length - 1; sub = val[leng]; } - console.log(val); this.query.subjectNames = val.filter((item) => { return sub != "全部" ? item != "全部" : item == "全部"; }); diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue index 157fee2..1efa0f2 100644 --- a/src/views/personal/test/index.vue +++ b/src/views/personal/test/index.vue @@ -515,7 +515,6 @@ export default { let leng = val.length - 1; sub = val[leng]; } - console.log(val); this.query.subjectNames = val.filter((item) => { return sub != "全部" ? item != "全部" : item == "全部"; }); diff --git a/src/views/personal/userInfo/index.vue b/src/views/personal/userInfo/index.vue index ff3de4d..67df56d 100644 --- a/src/views/personal/userInfo/index.vue +++ b/src/views/personal/userInfo/index.vue @@ -214,7 +214,7 @@ export default { this.loading = true; const { data, status, info } = await this.$request.getInfo(); this.loading = false; - console.log(status); + if (status === 0) { this.Info = { ...data }; for (let key in this.formSchool) {