Commit 11cb8ce04e612f60512ce85175b51d793ffb741b
1 parent
76eb1bf6
样式调整
Showing
2 changed files
with
11 additions
and
4 deletions
src/views/examinationPaper/edit.vue
| @@ -479,7 +479,7 @@ | @@ -479,7 +479,7 @@ | ||
| 479 | </div> | 479 | </div> |
| 480 | <div slot="footer"> | 480 | <div slot="footer"> |
| 481 | <el-button @click="dialogTag = false">取 消</el-button> | 481 | <el-button @click="dialogTag = false">取 消</el-button> |
| 482 | - <el-button type="primary" @click="dialogTag = false">确 定</el-button> | 482 | + <el-button type="primary" @click="setKnowledge">确 定</el-button> |
| 483 | </div> | 483 | </div> |
| 484 | </el-dialog> | 484 | </el-dialog> |
| 485 | </div> | 485 | </div> |
| @@ -949,7 +949,7 @@ export default { | @@ -949,7 +949,7 @@ export default { | ||
| 949 | } else { | 949 | } else { |
| 950 | detail = | 950 | detail = |
| 951 | this.type == 1 | 951 | this.type == 1 |
| 952 | - ? this.$request.paperDetail | 952 | + ? this.$request.fetchPaperDetail |
| 953 | : this.type == 2 | 953 | : this.type == 2 |
| 954 | ? this.$request.examQuestionList | 954 | ? this.$request.examQuestionList |
| 955 | : this.$request.periodQuestionList; | 955 | : this.$request.periodQuestionList; |
| @@ -1111,13 +1111,20 @@ export default { | @@ -1111,13 +1111,20 @@ export default { | ||
| 1111 | .content { | 1111 | .content { |
| 1112 | width: 100%; | 1112 | width: 100%; |
| 1113 | box-sizing: border-box; | 1113 | box-sizing: border-box; |
| 1114 | - padding: 0 50px; | 1114 | + padding: 0 50px 60px; |
| 1115 | .ml-20 { | 1115 | .ml-20 { |
| 1116 | margin-left: 20px; | 1116 | margin-left: 20px; |
| 1117 | } | 1117 | } |
| 1118 | .btn-box { | 1118 | .btn-box { |
| 1119 | + width: calc(100% - 240px); | ||
| 1120 | + position: fixed; | ||
| 1121 | + right: 40px; | ||
| 1122 | + bottom: 20px; | ||
| 1123 | + padding: 10px 0 20px; | ||
| 1124 | + background: #fff; | ||
| 1119 | text-align: right; | 1125 | text-align: right; |
| 1120 | margin-left: 140px; | 1126 | margin-left: 140px; |
| 1127 | + z-index: 10; | ||
| 1121 | } | 1128 | } |
| 1122 | .tips { | 1129 | .tips { |
| 1123 | height: 48px; | 1130 | height: 48px; |
src/views/standard/device/index.vue
| @@ -619,7 +619,7 @@ export default { | @@ -619,7 +619,7 @@ export default { | ||
| 619 | this.stationReport(); | 619 | this.stationReport(); |
| 620 | this._QueryGradeList(); | 620 | this._QueryGradeList(); |
| 621 | this._QueryData(); | 621 | this._QueryData(); |
| 622 | - if (role == "ROLE_JITUAN") { | 622 | + if (this.role == "ROLE_JITUAN") { |
| 623 | this.showSchool(); | 623 | this.showSchool(); |
| 624 | } | 624 | } |
| 625 | }, | 625 | }, |