Commit 5e2e009a1f43917949cb40255c7b67160e5d9251
1 parent
e0c18984
基站筛选条件显示问题，归档文本替换
Showing
4 changed files
with
16 additions
and
3 deletions
src/views/standard/card/index.vue
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | <div class="page-content"> | 9 | <div class="page-content"> |
| 10 | <div class="answer-header"> | 10 | <div class="answer-header"> |
| 11 | <div class="sel-box"> | 11 | <div class="sel-box"> |
| 12 | - <template v-if="role == 'ROLE_XUEXIAO'"> | 12 | + <!-- <template v-if="role == 'ROLE_XUEXIAO'"> |
| 13 | <el-cascader | 13 | <el-cascader |
| 14 | @change="(page = 1), _QueryData(1)" | 14 | @change="(page = 1), _QueryData(1)" |
| 15 | size="small" | 15 | size="small" |
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | :props="props" | 21 | :props="props" |
| 22 | :show-all-levels="false" | 22 | :show-all-levels="false" |
| 23 | ></el-cascader> | 23 | ></el-cascader> |
| 24 | - </template> | 24 | + </template> --> |
| 25 | <template v-if="role == 'ROLE_JITUAN'"> | 25 | <template v-if="role == 'ROLE_JITUAN'"> |
| 26 | <el-select | 26 | <el-select |
| 27 | class="sel2" | 27 | class="sel2" |
src/views/standard/device/index.vue
| @@ -261,6 +261,7 @@ | @@ -261,6 +261,7 @@ | ||
| 261 | v-model="query.sn" | 261 | v-model="query.sn" |
| 262 | class="input-with-select" | 262 | class="input-with-select" |
| 263 | clearable | 263 | clearable |
| 264 | + @input.native="query.studentName=''" | ||
| 264 | @keyup.enter.native="_QueryData(true)" | 265 | @keyup.enter.native="_QueryData(true)" |
| 265 | > | 266 | > |
| 266 | <el-button | 267 | <el-button |
| @@ -274,6 +275,7 @@ | @@ -274,6 +275,7 @@ | ||
| 274 | v-model="query.studentName" | 275 | v-model="query.studentName" |
| 275 | class="input-with-select" | 276 | class="input-with-select" |
| 276 | clearable | 277 | clearable |
| 278 | + @input.native="query.sn=''" | ||
| 277 | @keyup.enter.native="_QueryData(true)" | 279 | @keyup.enter.native="_QueryData(true)" |
| 278 | > | 280 | > |
| 279 | <el-button | 281 | <el-button |
| @@ -1092,8 +1094,16 @@ export default { | @@ -1092,8 +1094,16 @@ export default { | ||
| 1092 | //整理传参 | 1094 | //整理传参 |
| 1093 | let query = {}; | 1095 | let query = {}; |
| 1094 | if (this.query.sn) { | 1096 | if (this.query.sn) { |
| 1097 | + this.query.classId = []; | ||
| 1098 | + this.query.onlineStatus = ""; | ||
| 1099 | + this.query.type = ""; | ||
| 1100 | + this.query.studentName = ""; | ||
| 1095 | query.sn = this.query.sn; | 1101 | query.sn = this.query.sn; |
| 1096 | } else if (this.query.studentName) { | 1102 | } else if (this.query.studentName) { |
| 1103 | + this.query.classId = []; | ||
| 1104 | + this.query.onlineStatus = ""; | ||
| 1105 | + this.query.type = ""; | ||
| 1106 | + this.query.sn = ""; | ||
| 1097 | query.studentName = this.query.studentName; | 1107 | query.studentName = this.query.studentName; |
| 1098 | } else { | 1108 | } else { |
| 1099 | if (this.type == 1) { | 1109 | if (this.type == 1) { |
src/views/standard/setUp/school.vue
src/views/standard/setUp/student.vue
| @@ -296,7 +296,7 @@ | @@ -296,7 +296,7 @@ | ||
| 296 | </div> | 296 | </div> |
| 297 | </el-dialog> | 297 | </el-dialog> |
| 298 | <el-dialog title="班级归档" :visible.sync="diaArchiving" width="400"> | 298 | <el-dialog title="班级归档" :visible.sync="diaArchiving" width="400"> |
| 299 | - <p>注意该操作会将该班级进行归档操作，且不可撤销，请谨慎操作！</p> | 299 | + <p>注意班级归档后，学生解除班级关系且相关老师任课信息将不存在，确认要将班级归档吗？</p> |
| 300 | <div class="dialog-footer" slot="footer"> | 300 | <div class="dialog-footer" slot="footer"> |
| 301 | <el-button type="danger" @click="archivingClass">确认归档</el-button> | 301 | <el-button type="danger" @click="archivingClass">确认归档</el-button> |
| 302 | <el-button type="primary" @click="diaArchiving = false" | 302 | <el-button type="primary" @click="diaArchiving = false" |