diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 994aaaf..2b1d239 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -43,6 +43,7 @@ border: 1px solid #e2e2e2; box-sizing: border-box; background: #fff; + .el-input__inner { border-radius: 20px; border: none; @@ -76,6 +77,7 @@ } } } + .answer-box { .answer-s { display: inline-block; @@ -88,6 +90,7 @@ color: #333; text-align: center; line-height: 30px; + &.active { background: #5e78fa; border-color: #5e78fa; @@ -95,6 +98,7 @@ } } } + .el-menu-item i { width: 12px; text-align: center; @@ -104,43 +108,57 @@ .el-table thead th.el-table__cell { background: #f5f7fa; } -.el-table .el-table__cell.bg{ + +.el-table .el-table__cell.bg { background: #f9f9f9; } + +.el-table th.el-table__cell.p0>.cell { + padding-left: 0; + padding-right: 0; +} + .el-menu--popup { min-width: 160px; } + .ellipsis { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -.pagination-box{ - text-align:center; - margin:10px; + +.pagination-box { + text-align: center; + margin: 10px; } -.down-txt{ + +.down-txt { display: flex; align-items: center; padding-left: 160px; } -.h-title{ - padding-left:12px; + +.h-title { + padding-left: 12px; position: relative; - font-size:16px; - &:after{ - content:""; - position:absolute; - left:0; - top:50%; - margin-top:-8px; - width:3px; - height:16px; + font-size: 16px; + + &:after { + content: ""; + position: absolute; + left: 0; + top: 50%; + margin-top: -8px; + width: 3px; + height: 16px; background: #2e9afe; } } -div,ul{ - &::-webkit-scrollbar{ - width:0; + +div, +ul { + &::-webkit-scrollbar { + width: 0; } } \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index c863220..c753202 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -723,6 +723,7 @@ export function formatGradeNameClass(data) { { value: item.classCode, label: item.className, + leaf:true }, ], }); @@ -736,6 +737,7 @@ export function formatGradeNameClass(data) { gradeNameArr[gradeIndex].children.push({ value: item.classCode, label: item.className, + leaf:true }); } }); diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue index e6f4559..e068e8c 100644 --- a/src/views/ask/analysis.vue +++ b/src/views/ask/analysis.vue @@ -152,7 +152,7 @@ prop="duration" label="答题耗时" align="center" - > + > - 单课时报表 + { if (item.roleName == this.$store.getters.info.showRoleName) { diff --git a/src/views/device/log.vue b/src/views/device/log.vue index 4a8c8f1..d6d5ebd 100644 --- a/src/views/device/log.vue +++ b/src/views/device/log.vue @@ -64,9 +64,7 @@ >本季度

- 筛选 + 筛选
@@ -196,7 +194,7 @@ export default { //中国式星期天是一周的最后一天 day = 7; } - day-- + day--; let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day; that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd"); that.query.endDay = formatDate(new Date(), "yyyy-MM-dd"); @@ -287,7 +285,7 @@ export default { }); this.loading = false; if (status === 0) { - this.tableData = data?.list&&[...data?.list] || []; + this.tableData = (data?.list && [...data?.list]) || []; this.total = data.count; } else { this.$message.error(info); @@ -301,7 +299,10 @@ export default { .page-content { padding: 20px; } -.table-box{ - padding:0 20px; +.table-box { + padding: 0 20px; +} +.serach-box{ + margin-left:20px; } \ No newline at end of file diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue index a10da18..0078601 100644 --- a/src/views/examinationPaper/add.vue +++ b/src/views/examinationPaper/add.vue @@ -151,8 +151,8 @@ icon="el-icon-delete" > - - 总分数：{{ setScore(question) }}分 + 共：{{ question.subQuestions.length }}题 + 共：{{ setScore(question) }}分

  • @@ -330,10 +330,10 @@ :value="item.value" > - + - + - + {{ setBigNum(index) }}、 {{ question.questionTitle }} - 共 {{ setScore(question) }} 分 + 共：{{ question.subQuestions.length }}题 + 共：{{ setScore(question) }} 分

    • @@ -477,7 +478,7 @@ class="answer-s" v-for="option in subQuestions.answerOptions.split(',')" :class=" - subQuestions.correctAnswer.includes(option) + subQuestions.correctAnswer?.includes(option) ? 'active' : '' " @@ -876,7 +877,7 @@ export default { } else if (type == 3) { txt = ans + ","; } else if (type == 4) { - txt = ans == 1 ? "✓" : "✗"; + txt = ans == 1 ? "✓" : ans == 2 ? "✗" : ""; } return txt; }, @@ -907,75 +908,71 @@ export default { // } // }); // if (!valid) { - //添加题目ID、序号 - this.form.questionList.map((item, index) => { - item.questionType = 0; - item.subQuestions.map((items, indexs) => { - items.questionId = this.setNum(index, indexs); - items.questionIndex = this.setNum(index, indexs); - }); + //添加题目ID、序号 + this.form.questionList.map((item, index) => { + item.questionType = 0; + item.subQuestions.map((items, indexs) => { + items.questionId = this.setNum(index, indexs); + items.questionIndex = this.setNum(index, indexs); }); - //整理问题 - this.form.questionList?.map((item) => { - let types = [{}]; - let addndex = 0; - item.subQuestions.map((sub, index) => { - if (!!sub.questionType && sub.questionType != 5) { - if (sub.questionType == types[addndex].qusType) { - //同类型批量答案+1 - types[addndex].subNum += 1; - if ( - types[addndex].answerOptions.length < sub.answerOptions.length - ) { - types[addndex].answerOptions = sub.answerOptions; - } - types[addndex].answerList += this.setAnswer( - sub.questionType, - sub.correctAnswer - ); - if (index == item.subQuestions.length - 1) { - //循环最后类型数量大于等于5，保存批量答案 - if (types[addndex].subNum && types[addndex].subNum >= 5) { - types[addndex].endIndex = sub.questionIndex; - types[addndex].index = index; - } - } - } else { + }); + //整理问题 + this.form.questionList?.map((item) => { + let types = [{}]; + let addndex = 0; + item.subQuestions.map((sub, index) => { + if (!!sub.questionType && sub.questionType != 5) { + if (sub.questionType == types[addndex].qusType) { + //同类型批量答案+1 + types[addndex].subNum += 1; + if ( + types[addndex].answerOptions.length < sub.answerOptions.length + ) { + types[addndex].answerOptions = sub.answerOptions; + } + + // types[addndex].answerList += this.setAnswer( + // sub.questionType, + // sub.correctAnswer + // ); + types[addndex].answerList = ""; + if (index == item.subQuestions.length - 1) { + //循环最后类型数量大于等于5，保存批量答案 if (types[addndex].subNum && types[addndex].subNum >= 5) { - //不同类型时如果原有类型数量大于等于5，保存批量答案 - types[addndex].endIndex = - item.subQuestions[index - 1].questionIndex; - types[addndex].index = index - 1; - addndex += 1; - types[addndex] = {}; + types[addndex].endIndex = sub.questionIndex; + types[addndex].index = index; } - //不同类型初始化批量答案 - types[addndex].qusType = sub.questionType; - types[addndex].subNum = 1; - types[addndex].answerOptions = sub.answerOptions; - types[addndex].answerList = this.setAnswer( - sub.questionType, - sub.correctAnswer - ); } - } - }); - for (let i = 0; i < types.length; i++) { - if (types[i].qusType == 3) { - types[i].answerList = types[i].answerList.slice(0, -1); - } - if (types[i].subNum >= 5) { - item.subQuestions.splice( - types[i].index + i + 1, - 0, - deepClone(types[i]) - ); + } else { + if (types[addndex].subNum && types[addndex].subNum >= 5) { + //不同类型时如果原有类型数量大于等于5，保存批量答案 + types[addndex].endIndex = + item.subQuestions[index - 1].questionIndex; + types[addndex].index = index - 1; + addndex += 1; + types[addndex] = {}; + } + //不同类型初始化批量答案 + types[addndex].qusType = sub.questionType; + types[addndex].subNum = 1; + types[addndex].answerOptions = sub.answerOptions; + types[addndex].answerList = "" } } - console.log(types); }); - this.step = 2; - return; + for (let i = 0; i < types.length; i++) { + if (types[i].subNum >= 5) { + item.subQuestions.splice( + types[i].index + i + 1, + 0, + deepClone(types[i]) + ); + } + } + console.log(types); + }); + this.step = 2; + return; // } else { // this.$message.error( // `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！` @@ -1384,6 +1381,9 @@ export default { } .question-title { line-height: 40px; + .m20{ + margin-right:20px; + } .ipt { width: 300px; margin: 0 16px 0 10px; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5e51b28..28aae79 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -95,6 +95,8 @@ export default { loginForm: { // username: "15911715665", // password: "715665", + // username: "18087527793", + // password: "Pw527793#", // username: "18687826606", // password: "Pw826606#", // username: "18893712576", diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue index d6cfb84..f999ea7 100644 --- a/src/views/setUp/account.vue +++ b/src/views/setUp/account.vue @@ -5,7 +5,8 @@ 账号管理