diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue index ad93eb8..faf0866 100644 --- a/src/views/examinationPaper/edit.vue +++ b/src/views/examinationPaper/edit.vue @@ -479,7 +479,7 @@
取 消 - 确 定 + 确 定
@@ -949,7 +949,7 @@ export default { } else { detail = this.type == 1 - ? this.$request.paperDetail + ? this.$request.fetchPaperDetail : this.type == 2 ? this.$request.examQuestionList : this.$request.periodQuestionList; @@ -1111,13 +1111,20 @@ export default { .content { width: 100%; box-sizing: border-box; - padding: 0 50px; + padding: 0 50px 60px; .ml-20 { margin-left: 20px; } .btn-box { + width: calc(100% - 240px); + position: fixed; + right: 40px; + bottom: 20px; + padding: 10px 0 20px; + background: #fff; text-align: right; margin-left: 140px; + z-index: 10; } .tips { height: 48px; diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue index cffca08..1bbf281 100644 --- a/src/views/standard/device/index.vue +++ b/src/views/standard/device/index.vue @@ -619,7 +619,7 @@ export default { this.stationReport(); this._QueryGradeList(); this._QueryData(); - if (role == "ROLE_JITUAN") { + if (this.role == "ROLE_JITUAN") { this.showSchool(); } },