Commit cffc1a98893891fd407666069065d2983437d116
1 parent
34b574e0
3-8BUG
Showing
5 changed files
with
12 additions
and
8 deletions
src/views/examinationPaper/add.vue
| @@ -535,7 +535,10 @@ | @@ -535,7 +535,10 @@ | ||
| 535 | </el-form-item> | 535 | </el-form-item> |
| 536 | <el-form-item | 536 | <el-form-item |
| 537 | label="设置答案：" | 537 | label="设置答案：" |
| 538 | - v-show="questionForm.questionType != 5" | 538 | + v-show=" |
| 539 | + questionForm.questionType != 5 || | ||
| 540 | + questionForm.questionType == 6 | ||
| 541 | + " | ||
| 539 | > | 542 | > |
| 540 | <div class="qs-options"> | 543 | <div class="qs-options"> |
| 541 | <p class="ipt"> | 544 | <p class="ipt"> |
| @@ -1840,8 +1843,8 @@ export default { | @@ -1840,8 +1843,8 @@ export default { | ||
| 1840 | this.subjectList = | 1843 | this.subjectList = |
| 1841 | data.subjectNames?.map((item) => { | 1844 | data.subjectNames?.map((item) => { |
| 1842 | return { | 1845 | return { |
| 1843 | - value: this.role == "ROLE_PERSONAL" ?item.subjectName: item , | ||
| 1844 | - label: this.role == "ROLE_PERSONAL" ?item.subjectName: item , | 1846 | + value: this.role == "ROLE_PERSONAL" ? item.subjectName : item, |
| 1847 | + label: this.role == "ROLE_PERSONAL" ? item.subjectName : item, | ||
| 1845 | }; | 1848 | }; |
| 1846 | }) || []; | 1849 | }) || []; |
| 1847 | if (this.subjectList.length) { | 1850 | if (this.subjectList.length) { |
src/views/examinationPaper/index.vue
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | </div> | 76 | </div> |
| 77 | </div> | 77 | </div> |
| 78 | <p class="tips" v-show="archivedTotal"> | 78 | <p class="tips" v-show="archivedTotal"> |
| 79 | - <span>另有{{ archivedTotal }}份已经归档的答题卡,</span> | 79 | + <span>回收站内已有{{ archivedTotal }}份答题卡,</span> |
| 80 | <router-link to="/examinationPaperRecycle">点击查看>></router-link> | 80 | <router-link to="/examinationPaperRecycle">点击查看>></router-link> |
| 81 | </p> | 81 | </p> |
| 82 | <ul class="content" v-if="tableData && tableData.length"> | 82 | <ul class="content" v-if="tableData && tableData.length"> |
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | >修改分享范围</el-dropdown-item | 154 | >修改分享范围</el-dropdown-item |
| 155 | > | 155 | > |
| 156 | <el-dropdown-item :command="2">复制</el-dropdown-item> | 156 | <el-dropdown-item :command="2">复制</el-dropdown-item> |
| 157 | - <el-dropdown-item :command="3">归档</el-dropdown-item> | 157 | + <el-dropdown-item :command="3">放入回收站</el-dropdown-item> |
| 158 | </el-dropdown-menu> | 158 | </el-dropdown-menu> |
| 159 | </el-dropdown> | 159 | </el-dropdown> |
| 160 | </div> | 160 | </div> |
src/views/layout/Footer/bottom.vue
src/views/standard/device/index.vue
| @@ -264,11 +264,11 @@ | @@ -264,11 +264,11 @@ | ||
| 264 | label="配对码" | 264 | label="配对码" |
| 265 | align="center" | 265 | align="center" |
| 266 | ></el-table-column> | 266 | ></el-table-column> |
| 267 | - <el-table-column | 267 | + <!-- <el-table-column |
| 268 | prop="answerTimes" | 268 | prop="answerTimes" |
| 269 | label="答题次数" | 269 | label="答题次数" |
| 270 | align="center" | 270 | align="center" |
| 271 | - ></el-table-column> | 271 | + ></el-table-column> --> |
| 272 | <el-table-column | 272 | <el-table-column |
| 273 | prop="latestReportTime" | 273 | prop="latestReportTime" |
| 274 | label="最后答题时间" | 274 | label="最后答题时间" |
src/views/standard/test/index.vue
| @@ -526,6 +526,7 @@ export default { | @@ -526,6 +526,7 @@ export default { | ||
| 526 | activated() { | 526 | activated() { |
| 527 | const that = this; | 527 | const that = this; |
| 528 | BusEvent.$on("keepAlive", async function () { | 528 | BusEvent.$on("keepAlive", async function () { |
| 529 | + that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : ""; | ||
| 529 | await that._QueryClassList(); | 530 | await that._QueryClassList(); |
| 530 | await that._QuerySubjectList(); | 531 | await that._QuerySubjectList(); |
| 531 | await that.setDate(1); | 532 | await that.setDate(1); |